sol-netctl: add the init and shutdown process of sol-netctl

The init and shutdown process of sol-netctl need to be added to the init and shutdown process of sol-comms. Signed-off-by: Wu Zheng <[email protected]>
solettaproject · May 24, 2016 · 19c60cb · 19c60cb
1 parent b95aad2
commit 19c60cb
Showing 1 changed file with 23 additions and 0 deletions.
diff --git a/src/lib/comms/sol-comms.c b/src/lib/comms/sol-comms.c
@@ -54,6 +54,22 @@ extern void sol_network_shutdown(void);
 extern void sol_oic_server_shutdown(void);
 #endif
 
+#ifdef NETCTL
+extern int sol_netctl_init(void);
+extern void sol_netctl_shutdown(void);
+#else
+static int
+sol_netctl_init(void)
+{
+    return 0;
+}
+
+static void
+sol_netctl_shutdown(void)
+{
+}
+#endif
+
 int sol_comms_init(void);
 void sol_comms_shutdown(void);
 
@@ -74,8 +90,14 @@ sol_comms_init(void)
     if (ret != 0)
         goto http_server_error;
 
+    ret = sol_netctl_init();
+    if (ret != 0)
+        goto netctl_error;
+
     return 0;
 
+netctl_error:
+    sol_netctl_shutdown();
 http_server_error:
     sol_http_client_init();
 http_client_error:
@@ -93,4 +115,5 @@ sol_comms_shutdown(void)
     sol_http_client_shutdown();
     sol_http_server_shutdown();
     sol_network_shutdown();
+    sol_netctl_shutdown();
 }