summaryrefslogtreecommitdiff
path: root/src/irmd
diff options
context:
space:
mode:
authorDimitri Staessens <dimitri.staessens@intec.ugent.be>2016-03-24 16:26:40 +0100
committerDimitri Staessens <dimitri.staessens@intec.ugent.be>2016-03-24 16:26:40 +0100
commitc32ccc39cfc793729890204c8d810eb7608f4474 (patch)
treee01b29ae0ff52d617c656b5d85babd472aaa4149 /src/irmd
parent683114204c81a4e989042ee5de12c4fc71fc910c (diff)
parent72abee4fc44e5e5092e215d5afee556e6e59347c (diff)
downloadouroboros-c32ccc39cfc793729890204c8d810eb7608f4474.tar.gz
ouroboros-c32ccc39cfc793729890204c8d810eb7608f4474.zip
Merged in sandervrijders/ouroboros/be-irm-msg (pull request #40)
lib: Adds IRMd messages for the dev.h API calls
Diffstat (limited to 'src/irmd')
-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);