diff options
| author | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2016-12-29 12:31:01 +0100 |
|---|---|---|
| committer | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2016-12-29 12:31:01 +0100 |
| commit | 4ccd3e2c8af00963ac6d88aac587de016300ed90 (patch) | |
| tree | 5c80c01627e76086aa48569c32a0c52a37e21a53 /src/ipcpd/normal/main.c | |
| parent | 43a3231b03aa0a639bcd8d61784c84095edfdb6e (diff) | |
| parent | e8d6e91203b0521572b0ae32202e69944dde8f04 (diff) | |
| download | ouroboros-4ccd3e2c8af00963ac6d88aac587de016300ed90.tar.gz ouroboros-4ccd3e2c8af00963ac6d88aac587de016300ed90.zip | |
Merged in dstaesse/ouroboros/be-normal-dev (pull request #330)
ipcpd: Rename normal/path to normal/pathname
Diffstat (limited to 'src/ipcpd/normal/main.c')
| -rw-r--r-- | src/ipcpd/normal/main.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/ipcpd/normal/main.c b/src/ipcpd/normal/main.c index 4eb708b4..34ba52da 100644 --- a/src/ipcpd/normal/main.c +++ b/src/ipcpd/normal/main.c @@ -215,22 +215,24 @@ int main(int argc, char * argv[]) pthread_sigmask(SIG_UNBLOCK, &sigset, NULL); - if (fmgr_init()) { + if (ribmgr_init()) { + fmgr_fini(); ipcp_fini(); close_logfile(); exit(EXIT_FAILURE); } - if (ribmgr_init()) { + if (ipcp_create_r(getpid())) { + LOG_ERR("Failed to notify IRMd we are initialized."); fmgr_fini(); ipcp_fini(); close_logfile(); exit(EXIT_FAILURE); } - if (ipcp_create_r(getpid())) { - LOG_ERR("Failed to notify IRMd we are initialized."); - fmgr_fini(); + ipcp_wait_state(IPCP_OPERATIONAL, NULL); + + if (fmgr_init()) { ipcp_fini(); close_logfile(); exit(EXIT_FAILURE); |