diff options
| author | dimitri staessens <dimitri.staessens@intec.ugent.be> | 2016-07-05 16:36:40 +0200 |
|---|---|---|
| committer | dimitri staessens <dimitri.staessens@intec.ugent.be> | 2016-07-05 16:36:40 +0200 |
| commit | 51ccc34e0fe15aaf711f30fa8b63de1e1881029f (patch) | |
| tree | 6c75a9574860e436287c5344ad8364d412c73543 /src/irmd/main.c | |
| parent | 627c11526e57b94d466a7d7acd4fe0bf8cd2b776 (diff) | |
| parent | daa4e408b3e34bdc228d26816de09d7d1fb9b043 (diff) | |
| download | ouroboros-51ccc34e0fe15aaf711f30fa8b63de1e1881029f.tar.gz ouroboros-51ccc34e0fe15aaf711f30fa8b63de1e1881029f.zip | |
Merged in sandervrijders/ouroboros/be (pull request #154)
lib: Provide first implementation of revised CDAP
Diffstat (limited to 'src/irmd/main.c')
| -rw-r--r-- | src/irmd/main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/irmd/main.c b/src/irmd/main.c index ab637789..38e10cc5 100644 --- a/src/irmd/main.c +++ b/src/irmd/main.c @@ -1936,7 +1936,7 @@ void * irm_flow_cleaner() pthread_rwlock_rdlock(&instance->state_lock); - if (&instance->state == IRMD_NULL) { + if (instance->state == IRMD_NULL) { pthread_rwlock_unlock(&instance->state_lock); return (void *) 0; } @@ -2185,8 +2185,8 @@ void * mainloop() pthread_cleanup_pop(true); - buffer.size = irm_msg__get_packed_size(&ret_msg); - if (buffer.size == 0) { + buffer.len = irm_msg__get_packed_size(&ret_msg); + if (buffer.len == 0) { LOG_ERR("Failed to send reply message."); if (apis != NULL) free(apis); @@ -2194,7 +2194,7 @@ void * mainloop() continue; } - buffer.data = malloc(buffer.size); + buffer.data = malloc(buffer.len); if (buffer.data == NULL) { if (apis != NULL) free(apis); @@ -2204,7 +2204,7 @@ void * mainloop() irm_msg__pack(&ret_msg, buffer.data); - if (write(cli_sockfd, buffer.data, buffer.size) == -1) { + if (write(cli_sockfd, buffer.data, buffer.len) == -1) { free(buffer.data); if (apis != NULL) free(apis); |