From 54b1ba99e15660e2e12dbc564f7e7428b5440446 Mon Sep 17 00:00:00 2001 From: dimitri staessens Date: Fri, 12 Aug 2016 13:11:07 +0200 Subject: ipcpd: Fix bootstrap with api_bind Calling api_bind during bootstrap caused the IRMd to lock up. api_bind is now called after the normal completes bootstrapping. --- src/ipcpd/normal/fmgr.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/ipcpd/normal/fmgr.c') diff --git a/src/ipcpd/normal/fmgr.c b/src/ipcpd/normal/fmgr.c index 70afff37..437dac13 100644 --- a/src/ipcpd/normal/fmgr.c +++ b/src/ipcpd/normal/fmgr.c @@ -79,6 +79,7 @@ static void * fmgr_listen(void * o) { int fd; char * ae_name; + bool bound = false; while (true) { pthread_mutex_lock(&_ipcp->state_lock); @@ -93,6 +94,14 @@ 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."); -- cgit v1.2.3