Merged in dstaesse/ouroboros/be-create_r (pull request #367)

ipcpd, lib: Report IPCP creation failure

1 files changed, 5 insertions, 1 deletions

diff --git a/src/ipcpd/normal/main.c b/src/ipcpd/normal/main.c
index 2b30dba3..b69bfe28 100644
--- a/src/ipcpd/normal/main.c
+++ b/src/ipcpd/normal/main.c
@@ -459,17 +459,20 @@ int main(int    argc,
 
         if (ipcp_init(argc, argv, THIS_TYPE, &normal_ops) < 0) {
                 log_err("Failed to create instance.");
+                ipcp_create_r(getpid(), -1);
                 exit(EXIT_FAILURE);
         }
 
         if (irm_bind_api(getpid(), ipcpi.name)) {
                 log_err("Failed to bind AP name.");
+                ipcp_create_r(getpid(), -1);
                 ipcp_fini();
                 exit(EXIT_FAILURE);
         }
 
         if (rib_init()) {
                 log_err("Failed to initialize RIB.");
+                ipcp_create_r(getpid(), -1);
                 irm_unbind_api(getpid(), ipcpi.name);
                 ipcp_fini();
                 exit(EXIT_FAILURE);
@@ -479,6 +482,7 @@ int main(int    argc,
 
         if (ipcp_boot() < 0) {
                 log_err("Failed to boot IPCP.");
+                ipcp_create_r(getpid(), -1);
                 rib_fini();
                 irm_unbind_api(getpid(), ipcpi.name);
                 ipcp_fini();
@@ -487,7 +491,7 @@ int main(int    argc,
 
         pthread_sigmask(SIG_UNBLOCK, &sigset, NULL);
 
-        if (ipcp_create_r(getpid())) {
+        if (ipcp_create_r(getpid(), 0)) {
                 log_err("Failed to notify IRMd we are initialized.");
                 ipcp_set_state(IPCP_NULL);
                 ipcp_shutdown();