ipcpd: Wait for operational state to start fmgr

The main thread will wait for the IPCP_OPERATIONAL state before
starting the fmgr main thread by calling fmgr_init(), instead of the
fmgr itself waiting for that state.

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);