summaryrefslogtreecommitdiff
path: root/src/ipcpd/normal
diff options
context:
space:
mode:
authorSander Vrijders <sander.vrijders@ugent.be>2017-03-26 16:04:54 +0000
committerdimitri staessens <dimitri.staessens@ugent.be>2017-03-26 16:04:54 +0000
commit7ee6dadd39f3d4b5874d23bfcdcdd66eb195124e (patch)
tree43abd2084831d5a36c88a8ad93b3dec3e48127cd /src/ipcpd/normal
parent0a75074b15f66a60496d196c0759d33afa3c8b18 (diff)
parent572013b92d82e78ef5e5b19d79316ae3131c71af (diff)
downloadouroboros-7ee6dadd39f3d4b5874d23bfcdcdd66eb195124e.tar.gz
ouroboros-7ee6dadd39f3d4b5874d23bfcdcdd66eb195124e.zip
Merged in sandervrijders/ouroboros/be-pointer (pull request #425)
ipcpd: normal: Fix compilation issue
Diffstat (limited to 'src/ipcpd/normal')
-rw-r--r--src/ipcpd/normal/fmgr.c2
-rw-r--r--src/ipcpd/normal/graph.c14
-rw-r--r--src/ipcpd/normal/routing.c4
3 files changed, 11 insertions, 9 deletions
diff --git a/src/ipcpd/normal/fmgr.c b/src/ipcpd/normal/fmgr.c
index d2966d0c..a8a9ba58 100644
--- a/src/ipcpd/normal/fmgr.c
+++ b/src/ipcpd/normal/fmgr.c
@@ -494,7 +494,7 @@ int fmgr_np1_alloc(int fd,
return -1;
}
- free(buf->data);
+ free(buf.data);
fmgr.np1_fd_to_cep_id[fd] = cep_id;
fmgr.np1_cep_id_to_fd[cep_id] = fd;
diff --git a/src/ipcpd/normal/graph.c b/src/ipcpd/normal/graph.c
index b3e105e3..272576bb 100644
--- a/src/ipcpd/normal/graph.c
+++ b/src/ipcpd/normal/graph.c
@@ -106,15 +106,15 @@ static void del_edge(struct edge * edge)
free(edge);
}
-static int add_vertex(struct graph * graph,
- uint64_t addr)
+static struct vertex * add_vertex(struct graph * graph,
+ uint64_t addr)
{
struct vertex * vertex;
struct list_head * p;
vertex = malloc(sizeof(*vertex));
if (vertex == NULL)
- return -1;
+ return NULL;
list_head_init(&vertex->next);
list_head_init(&vertex->edges);
@@ -130,7 +130,7 @@ static int add_vertex(struct graph * graph,
graph->nr_vertices++;
- return 0;
+ return vertex;
}
static void del_vertex(struct graph * graph,
@@ -206,7 +206,8 @@ int graph_add_edge(struct graph * graph,
v = find_vertex_by_addr(graph, s_addr);
if (v == NULL) {
- if (add_vertex(graph, s_addr)) {
+ v = add_vertex(graph, s_addr);
+ if (v == NULL) {
pthread_mutex_unlock(&graph->lock);
return -ENOMEM;
}
@@ -221,7 +222,8 @@ int graph_add_edge(struct graph * graph,
nb = find_vertex_by_addr(graph, d_addr);
if (nb == NULL) {
- if (add_vertex(graph, d_addr)) {
+ nb = add_vertex(graph, d_addr);
+ if (nb == NULL) {
pthread_mutex_unlock(&graph->lock);
return -ENOMEM;
}
diff --git a/src/ipcpd/normal/routing.c b/src/ipcpd/normal/routing.c
index b750ca84..998b294a 100644
--- a/src/ipcpd/normal/routing.c
+++ b/src/ipcpd/normal/routing.c
@@ -291,12 +291,12 @@ static void * rib_listener(void * o)
}
}
- while (rib_event_wait(routing.set, routing.queue, NULL)) {
+ while (rib_event_wait(routing.set, routing.queue, NULL) == 0) {
flag = rqueue_next(routing.queue, path);
if (flag < 0)
continue;
- if (read_fso(children[i], flag)) {
+ if (read_fso(path, flag)) {
log_err("Failed to parse FSO.");
continue;
}