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 +++++++++ src/ipcpd/normal/main.c | 15 ++++++--------- 2 files changed, 15 insertions(+), 9 deletions(-) (limited to 'src/ipcpd/normal') 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."); diff --git a/src/ipcpd/normal/main.c b/src/ipcpd/normal/main.c index ea8d75e1..cf6ac728 100644 --- a/src/ipcpd/normal/main.c +++ b/src/ipcpd/normal/main.c @@ -101,7 +101,7 @@ static int normal_ipcp_name_reg(char * name) if (_ipcp->state != IPCP_ENROLLED) { pthread_mutex_unlock(&_ipcp->state_lock); - LOG_DBGF("Won't register with non-enrolled IPCP."); + LOG_ERR("Won't register with non-enrolled IPCP."); return -1; /* -ENOTENROLLED */ } @@ -158,8 +158,6 @@ static int normal_ipcp_enroll(char * dif_name) static int normal_ipcp_bootstrap(struct dif_config * conf) { - LOG_DBGF("Bootstrapping in DIF %s.", conf->dif_name); - pthread_mutex_lock(&_ipcp->state_lock); if (_ipcp->state != IPCP_INIT) { @@ -174,15 +172,14 @@ static int normal_ipcp_bootstrap(struct dif_config * conf) return -1; } - if (api_bind(conf->dif_name) < 0) { - LOG_ERR("Failed to bind the server AP instance."); - return -1; - } - ipcp_state_change(_ipcp, IPCP_ENROLLED); + _ipcp->data->dif_name = conf->dif_name; + pthread_mutex_unlock(&_ipcp->state_lock); + LOG_DBG("Bootstrapped in DIF %s.", conf->dif_name); + return 0; } @@ -248,7 +245,7 @@ void normal_ipcp_data_destroy() pthread_mutex_unlock(&_ipcp->state_lock); - free(_ipcp->data); + ipcp_data_destroy(_ipcp->data); } int main(int argc, char * argv[]) -- cgit v1.2.3