summaryrefslogtreecommitdiff
path: root/src/ipcpd
diff options
context:
space:
mode:
authorSander Vrijders <sander.vrijders@ugent.be>2017-08-20 11:00:00 +0200
committerSander Vrijders <sander.vrijders@ugent.be>2017-08-20 11:00:00 +0200
commitafe8b6f496dd4e0e3aaaa5dec0d6fb32253a49f7 (patch)
treebbc576afefa6d1f0c6708fd9894ef69e3a67eeb4 /src/ipcpd
parenteefae235dd7af96eef3dc4f82f706170c379d260 (diff)
parent45c77a507ed275830633849f368c4ed5b4831328 (diff)
downloadouroboros-afe8b6f496dd4e0e3aaaa5dec0d6fb32253a49f7.tar.gz
ouroboros-afe8b6f496dd4e0e3aaaa5dec0d6fb32253a49f7.zip
Merge branch 'testing' into be
Diffstat (limited to 'src/ipcpd')
-rw-r--r--src/ipcpd/ipcp.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/ipcpd/ipcp.c b/src/ipcpd/ipcp.c
index 7066fb04..368c6eb8 100644
--- a/src/ipcpd/ipcp.c
+++ b/src/ipcpd/ipcp.c
@@ -58,8 +58,6 @@ void ipcp_sig_handler(int sig,
if (ipcp_get_state() == IPCP_OPERATIONAL)
ipcp_set_state(IPCP_SHUTDOWN);
}
-
- tpm_stop();
default:
return;
}
@@ -689,8 +687,9 @@ int ipcp_boot()
void ipcp_shutdown()
{
- tpm_fini();
pthread_join(ipcpi.acceptor, NULL);
+ tpm_stop();
+ tpm_fini();
log_info("IPCP %d shutting down.", getpid());
}