summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSander Vrijders <sander.vrijders@intec.ugent.be>2017-01-05 10:54:28 +0100
committerSander Vrijders <sander.vrijders@intec.ugent.be>2017-01-05 10:54:28 +0100
commitb010708bd8beef1a186679d2a2ecca7c48fddfdc (patch)
tree8924ee430d2c33631468ae9be56a7487c6f6448b
parente0db38c8fcd7495d990698e86212a70b8440cad0 (diff)
parent51d814cd8071684150cae474dde680781ea5ce1e (diff)
downloadouroboros-b010708bd8beef1a186679d2a2ecca7c48fddfdc.tar.gz
ouroboros-b010708bd8beef1a186679d2a2ecca7c48fddfdc.zip
Merged in dstaesse/ouroboros/be-fixes (pull request #338)
ipcpd: Fix state in ipcp_boot
-rw-r--r--src/ipcpd/ipcp.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/ipcpd/ipcp.c b/src/ipcpd/ipcp.c
index e44fafe2..2e4c3fca 100644
--- a/src/ipcpd/ipcp.c
+++ b/src/ipcpd/ipcp.c
@@ -334,6 +334,9 @@ int ipcp_init(enum ipcp_type type, struct ipcp_ops * ops)
int ipcp_boot()
{
int t;
+
+ ipcp_set_state(IPCP_INIT);
+
for (t = 0; t < IPCPD_THREADPOOL_SIZE; ++t) {
if (pthread_create(&ipcpi.threadpool[t], NULL,
ipcp_main_loop, NULL)) {
@@ -346,8 +349,6 @@ int ipcp_boot()
}
}
- ipcpi.state = IPCP_INIT;
-
return 0;
}