diff options
Diffstat (limited to 'src/ipcpd/normal/fmgr.c')
-rw-r--r-- | src/ipcpd/normal/fmgr.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/ipcpd/normal/fmgr.c b/src/ipcpd/normal/fmgr.c index 82163aef..41785ae4 100644 --- a/src/ipcpd/normal/fmgr.c +++ b/src/ipcpd/normal/fmgr.c @@ -130,7 +130,7 @@ static void * fmgr_nm1_acceptor(void * o) (void) o; while (true) { - ipcp_wait_state(IPCP_RUNNING, NULL); + ipcp_wait_state(IPCP_OPERATIONAL, NULL); pthread_rwlock_rdlock(&ipcpi.state_lock); @@ -143,7 +143,7 @@ static void * fmgr_nm1_acceptor(void * o) fd = flow_accept(&ae_name, &qs); if (fd < 0) { - LOG_ERR("Failed to accept flow."); + LOG_WARN("Flow accept failed."); continue; } @@ -390,8 +390,8 @@ int fmgr_fini() for (i = 0; i < IRMD_MAX_FLOWS; i++) { if (fmgr.nm1_flows[i] == NULL) continue; - if (ribmgr_remove_flow(fmgr.nm1_flows[i]->fd)) - LOG_ERR("Failed to remove management flow."); + flow_dealloc(fmgr.nm1_flows[i]->fd); + free(fmgr.nm1_flows[i]); } pthread_rwlock_destroy(&fmgr.nm1_flows_lock); @@ -420,7 +420,7 @@ int fmgr_np1_alloc(int fd, pthread_rwlock_rdlock(&ipcpi.state_lock); - if (ipcp_get_state() != IPCP_RUNNING) { + if (ipcp_get_state() != IPCP_OPERATIONAL) { pthread_rwlock_unlock(&ipcpi.state_lock); LOG_ERR("IPCP is not enrolled yet."); return -1; /* -ENOTINIT */ |