diff options
| author | dimitri staessens <dimitri.staessens@intec.ugent.be> | 2016-12-06 14:31:49 +0000 |
|---|---|---|
| committer | dimitri staessens <dimitri.staessens@intec.ugent.be> | 2016-12-06 14:31:49 +0000 |
| commit | 3068c438767fe54a1cced215e6df379a5c7ea8bf (patch) | |
| tree | 841b7c48c047afc1ad2bc44999158e0bdf657a9e /src/ipcpd/normal/fmgr.c | |
| parent | 82ae7959d21c654fe9fd14de504f47d18b1ebcfc (diff) | |
| parent | a4031fa3d1eb63c1ff83ba37e5e89d6b1a7d5d04 (diff) | |
| download | ouroboros-3068c438767fe54a1cced215e6df379a5c7ea8bf.tar.gz ouroboros-3068c438767fe54a1cced215e6df379a5c7ea8bf.zip | |
Merged in sandervrijders/ouroboros/be-fix-normal-shutdown (pull request #320)
ipcpd: normal: Fix errors on IPCP shutdown
Diffstat (limited to 'src/ipcpd/normal/fmgr.c')
| -rw-r--r-- | src/ipcpd/normal/fmgr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ipcpd/normal/fmgr.c b/src/ipcpd/normal/fmgr.c index 82163aef..44b73627 100644 --- a/src/ipcpd/normal/fmgr.c +++ b/src/ipcpd/normal/fmgr.c @@ -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); |