summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordimitri staessens <dimitri.staessens@ugent.be>2017-08-29 16:48:48 +0000
committerSander Vrijders <sander.vrijders@ugent.be>2017-08-29 16:48:48 +0000
commitf3593b8a26c05392b09c16472b55f8662db22335 (patch)
tree8d56a7b6ad28522259711806a8642410d680c371
parentb1b2118b48fac84dbd5dcff0fdbb3f16e52febb9 (diff)
parent56933a90aa353fc366d6cdd2bdd58ca532f9b89e (diff)
downloadouroboros-f3593b8a26c05392b09c16472b55f8662db22335.tar.gz
ouroboros-f3593b8a26c05392b09c16472b55f8662db22335.zip
Merged in dstaesse/ouroboros/be-ipcp-thread-leaks (pull request #580)
ipcpd: Fix thread leaks in normal IPCP
-rw-r--r--src/ipcpd/normal/enroll.c2
-rw-r--r--src/ipcpd/normal/main.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ipcpd/normal/enroll.c b/src/ipcpd/normal/enroll.c
index 7f93ed3a..fc541859 100644
--- a/src/ipcpd/normal/enroll.c
+++ b/src/ipcpd/normal/enroll.c
@@ -373,6 +373,4 @@ void enroll_stop(void)
{
if (enroll.state == ENROLL_RUNNING)
pthread_cancel(enroll.listener);
-
- enroll.state = ENROLL_INIT;
}
diff --git a/src/ipcpd/normal/main.c b/src/ipcpd/normal/main.c
index 0a41f883..fa31b9be 100644
--- a/src/ipcpd/normal/main.c
+++ b/src/ipcpd/normal/main.c
@@ -399,6 +399,8 @@ int main(int argc,
stop_components();
}
+ finalize_components();
+
irm_unbind_api(getpid(), ipcpi.name);
ipcp_fini();