From a4031fa3d1eb63c1ff83ba37e5e89d6b1a7d5d04 Mon Sep 17 00:00:00 2001 From: Sander Vrijders Date: Tue, 6 Dec 2016 14:50:52 +0100 Subject: ipcpd: normal: Fix errors on IPCP shutdown This fixes several bad cleanups in the normal IPCP when it is shutting down. --- src/ipcpd/normal/ribmgr.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/ipcpd/normal/ribmgr.c') diff --git a/src/ipcpd/normal/ribmgr.c b/src/ipcpd/normal/ribmgr.c index 02cbbbfd..cbf68d0c 100644 --- a/src/ipcpd/normal/ribmgr.c +++ b/src/ipcpd/normal/ribmgr.c @@ -1644,6 +1644,7 @@ int ro_subscribe(const char * name, struct ro_sub_ops * ops) { struct ro_sub * sub; + int sid; assert(name); assert(ops); @@ -1664,19 +1665,21 @@ int ro_subscribe(const char * name, pthread_mutex_lock(&rib.subs_lock); - sub->sid = bmp_allocate(rib.sids); - if (sub->sid < 0) { + sid = bmp_allocate(rib.sids); + if (sid < 0) { pthread_mutex_unlock(&rib.subs_lock); free(sub->name); free(sub); LOG_ERR("Failed to get sub id."); + return -1; } + sub->sid = sid; list_add(&sub->next, &rib.subs); pthread_mutex_unlock(&rib.subs_lock); - return 0; + return sid; } int ro_unsubscribe(int sid) -- cgit v1.2.3