diff options
author | dimitri staessens <dimitri.staessens@ugent.be> | 2017-08-22 08:06:57 +0000 |
---|---|---|
committer | Sander Vrijders <sander.vrijders@ugent.be> | 2017-08-22 08:06:57 +0000 |
commit | 589b91b7422d3923045c3422a5b790b26162439a (patch) | |
tree | 8183f8f00f55f3af23c6d135b37984bcc4e2e28c /src/ipcpd/normal/enroll.c | |
parent | 5b242e7207483860143d3c84438134430ac1448f (diff) | |
parent | e539f82d2af8aac684ead174e22c04897e0f85c0 (diff) | |
download | ouroboros-589b91b7422d3923045c3422a5b790b26162439a.tar.gz ouroboros-589b91b7422d3923045c3422a5b790b26162439a.zip |
Merged in dstaesse/ouroboros/be-connmgr (pull request #559)
ipcpd: Improve locking in connmgr
Diffstat (limited to 'src/ipcpd/normal/enroll.c')
-rw-r--r-- | src/ipcpd/normal/enroll.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ipcpd/normal/enroll.c b/src/ipcpd/normal/enroll.c index 471230bc..a33239a0 100644 --- a/src/ipcpd/normal/enroll.c +++ b/src/ipcpd/normal/enroll.c @@ -324,6 +324,7 @@ int enroll_init(void) void enroll_fini(void) { + pthread_join(enroll.listener, NULL); cdap_destroy(enroll.cdap); connmgr_ae_destroy(enroll.ae); } @@ -339,5 +340,4 @@ int enroll_start(void) void enroll_stop(void) { pthread_cancel(enroll.listener); - pthread_join(enroll.listener, NULL); } |