summaryrefslogtreecommitdiff
path: root/src/irmd/main.c
diff options
context:
space:
mode:
authordimitri staessens <[email protected]>2016-03-24 19:52:01 +0100
committerdimitri staessens <[email protected]>2016-03-24 19:52:01 +0100
commit545092a8eaa1a972a2bcaf1b532d74f21db1b623 (patch)
treebecb621b18a37626728378576ffae4dd58b5290a /src/irmd/main.c
parentdd30bcdb1d440d812b47c0b998c8f120b271ea9b (diff)
parentc32ccc39cfc793729890204c8d810eb7608f4474 (diff)
downloadouroboros-545092a8eaa1a972a2bcaf1b532d74f21db1b623.tar.gz
ouroboros-545092a8eaa1a972a2bcaf1b532d74f21db1b623.zip
Merge branch 'be' of bitbucket.org:ouroboros-rina/ouroboros into be-shm
Diffstat (limited to 'src/irmd/main.c')
-rw-r--r--src/irmd/main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/irmd/main.c b/src/irmd/main.c
index 99896999..622b367d 100644
--- a/src/irmd/main.c
+++ b/src/irmd/main.c
@@ -143,7 +143,7 @@ static void enroll_ipcp(struct irm * instance,
char * dif_name)
{
pid_t pid = 0;
- rina_name_t * member;
+ char * member;
char ** n_1_difs = NULL;
ssize_t n_1_difs_size = 0;
@@ -161,7 +161,7 @@ static void enroll_ipcp(struct irm * instance,
n_1_difs_size = da_resolve_dap(member, n_1_difs);
if (n_1_difs_size != 0)
- if (ipcp_enroll(pid, dif_name, *member,
+ if (ipcp_enroll(pid, dif_name, member,
n_1_difs, n_1_difs_size))
LOG_ERR("Could not enroll IPCP");
}
@@ -231,7 +231,7 @@ int main()
}
count = read(cli_sockfd, buf, IRM_MSG_BUF_SIZE);
- if (count) {
+ if (count > 0) {
buffer.size = count;
buffer.data = buf;
msg = deserialize_irm_msg(&buffer);