diff options
| author | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2016-08-21 21:12:03 +0200 |
|---|---|---|
| committer | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2016-08-21 21:12:03 +0200 |
| commit | f0d4305c067044e74c44032c32ce6c4db3c6fffa (patch) | |
| tree | d895b25fb5a8f7af106c6c2d3228b62ade81b3b4 /src/ipcpd | |
| parent | ba27593e3e8406e109393ae383f17c7416675c1e (diff) | |
| parent | cee5ae97ee14438b2dabc06bfad9b02e42e4d816 (diff) | |
| download | ouroboros-f0d4305c067044e74c44032c32ce6c4db3c6fffa.tar.gz ouroboros-f0d4305c067044e74c44032c32ce6c4db3c6fffa.zip | |
Merged in dstaesse/ouroboros/be-irmd-refactor (pull request #213)
irmd, lib: Rebuild the IRMd data model
Diffstat (limited to 'src/ipcpd')
| -rw-r--r-- | src/ipcpd/ipcp.c | 2 | ||||
| -rw-r--r-- | src/ipcpd/normal/fmgr.c | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/src/ipcpd/ipcp.c b/src/ipcpd/ipcp.c index 0263d7b5..cc77af89 100644 --- a/src/ipcpd/ipcp.c +++ b/src/ipcpd/ipcp.c @@ -188,7 +188,7 @@ void * ipcp_main_loop(void * o) } conf_msg = msg->conf; conf.type = conf_msg->ipcp_type; - conf.dif_name = strdup(conf_msg->dif_name); + conf.dif_name = conf_msg->dif_name; if (conf.dif_name == NULL) { ret_msg.has_result = true; ret_msg.result = -1; diff --git a/src/ipcpd/normal/fmgr.c b/src/ipcpd/normal/fmgr.c index 437dac13..70afff37 100644 --- a/src/ipcpd/normal/fmgr.c +++ b/src/ipcpd/normal/fmgr.c @@ -79,7 +79,6 @@ static void * fmgr_listen(void * o) { int fd; char * ae_name; - bool bound = false; while (true) { pthread_mutex_lock(&_ipcp->state_lock); @@ -94,14 +93,6 @@ static void * fmgr_listen(void * o) } pthread_mutex_unlock(&_ipcp->state_lock); - if (!bound && api_bind(_ipcp->data->dif_name) < 0) { - LOG_ERR("Failed to bind the server instance."); - pthread_mutex_unlock(&_ipcp->state_lock); - return (void *) -1; - } - - bound = true; - fd = flow_accept(&ae_name); if (fd < 0) { LOG_ERR("Failed to accept flow."); |