summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordimitri staessens <dimitri.staessens@ugent.be>2017-03-20 13:37:16 +0100
committerdimitri staessens <dimitri.staessens@ugent.be>2017-03-20 13:37:16 +0100
commit6d6e1e2beec5bc003e490b8f96d861e6e8f7295d (patch)
treeb3ec49dd309cbbe3d2a3214055e833923c0ce0b0
parente26ddb08e8a5f37ca2caf9bd7a96c956816e96de (diff)
downloadouroboros-6d6e1e2beec5bc003e490b8f96d861e6e8f7295d.tar.gz
ouroboros-6d6e1e2beec5bc003e490b8f96d861e6e8f7295d.zip
ipcpd: Fix cleanup of connmgr
Fixed trying to double lock and cleanup order in main.
-rw-r--r--src/ipcpd/normal/connmgr.c43
-rw-r--r--src/ipcpd/normal/main.c4
2 files changed, 27 insertions, 20 deletions
diff --git a/src/ipcpd/normal/connmgr.c b/src/ipcpd/normal/connmgr.c
index c86beae8..b97d2b23 100644
--- a/src/ipcpd/normal/connmgr.c
+++ b/src/ipcpd/normal/connmgr.c
@@ -192,6 +192,27 @@ void connmgr_stop(void)
pthread_join(connmgr.acceptor, NULL);
}
+static void destroy_ae(struct ae * ae)
+{
+ struct list_head * p = NULL;
+ struct list_head * h = NULL;
+
+ pthread_mutex_lock(&ae->conn_lock);
+
+ list_for_each_safe(p, h, &ae->conn_list) {
+ struct ae_conn * e = list_entry(p, struct ae_conn, next);
+ list_del(&e->next);
+ free(e);
+ }
+
+ pthread_mutex_unlock(&ae->conn_lock);
+
+ pthread_cond_destroy(&ae->conn_cond);
+ pthread_mutex_destroy(&ae->conn_lock);
+
+ free(ae);
+}
+
void connmgr_fini(void)
{
struct list_head * p = NULL;
@@ -201,7 +222,8 @@ void connmgr_fini(void)
list_for_each_safe(p, n, &connmgr.aes) {
struct ae * e = list_entry(p, struct ae, next);
- connmgr_ae_destroy(e);
+ list_del(&e->next);
+ destroy_ae(e);
}
pthread_mutex_unlock(&connmgr.aes_lock);
@@ -242,30 +264,15 @@ struct ae * connmgr_ae_create(struct conn_info info)
void connmgr_ae_destroy(struct ae * ae)
{
- struct list_head * p = NULL;
- struct list_head * n = NULL;
-
assert(ae);
pthread_mutex_lock(&connmgr.aes_lock);
- pthread_mutex_lock(&ae->conn_lock);
-
- list_for_each_safe(p, n, &ae->conn_list) {
- struct ae_conn * e = list_entry(p, struct ae_conn, next);
- list_del(&e->next);
- free(e);
- }
-
- pthread_mutex_unlock(&ae->conn_lock);
-
- pthread_cond_destroy(&ae->conn_cond);
- pthread_mutex_destroy(&ae->conn_lock);
list_del(&ae->next);
- pthread_mutex_unlock(&connmgr.aes_lock);
+ destroy_ae(ae);
- free(ae);
+ pthread_mutex_unlock(&connmgr.aes_lock);
}
int connmgr_alloc(struct ae * ae,
diff --git a/src/ipcpd/normal/main.c b/src/ipcpd/normal/main.c
index 814a0c0b..398d6ee3 100644
--- a/src/ipcpd/normal/main.c
+++ b/src/ipcpd/normal/main.c
@@ -472,10 +472,10 @@ int main(int argc,
rib_fini();
- connmgr_fini();
-
enroll_fini();
+ connmgr_fini();
+
irm_unbind_api(getpid(), ipcpi.name);
ipcp_fini();