[Add] tether plugin

[platform/core/connectivity/stc-manager.git] / src / stc-manager.c

diff --git a/src/stc-manager.c b/src/stc-manager.c
index d83f079..58f6531 100644 (file)
--- a/src/stc-manager.c
+++ b/src/stc-manager.c
@@ -18,7 +18,6 @@
 #include <errno.h>
 #include <sys/wait.h>
 #include "stc-manager.h"
-#include "stc-emulator.h"
 #include "stc-manager-gdbus.h"
 #include "stc-db.h"
 #include "counter.h"
@@ -32,6 +31,7 @@
 #include "stc-manager-plugin-appstatus.h"
 #include "stc-manager-plugin-exception.h"
 #include "stc-manager-plugin-procfs.h"
+#include "stc-manager-plugin-tether.h"
 
 #define BUF_SIZE_FOR_ERR 100
 
@@ -90,6 +90,7 @@ static void __stc_manager_deinit(void)
        stc_plugin_appstatus_deinit();
        stc_plugin_exception_deinit();
        stc_plugin_procfs_deinit();
+       stc_plugin_tether_deinit();
 
        inotify_deregister(INFO_STORAGE_DIR);
        inotify_deinitialize();
@@ -124,6 +125,7 @@ static stc_s *__stc_manager_init(void)
        stc_plugin_appstatus_init();
        stc_plugin_exception_init();
        stc_plugin_procfs_init();
+       stc_plugin_tether_init();
 
        stc_firewall_init();
 
@@ -176,7 +178,7 @@ int stc_commit_iptables(char *cmd, int *err_num, char **err_str)
        if (pid == 0) {
                errno = 0;
                if (execv(args[0], args) == -1) {
-                       STC_LOGE("Failed to execute [%s]", err_str);
+                       STC_LOGE("Failed to execute [%s]", *err_str);
                        g_strfreev(args);
                        exit(-1);
                }
@@ -236,13 +238,11 @@ gint32 main(gint32 argc, gchar *argv[])
        /* Crate the GLIB main loop */
        main_loop = g_main_loop_new(NULL, FALSE);
 
-       stc_emulator_check_environment();
-       if (stc_emulator_is_emulated() == FALSE) {
-               g_stc = __stc_manager_init();
-               if (!g_stc)
-                       goto fail;
-               g_stc->main_loop = main_loop;
-       }
+       g_stc = __stc_manager_init();
+       if (!g_stc)
+               goto fail;
+
+       g_stc->main_loop = main_loop;
 
        /* Run the main loop */
        g_main_loop_run(main_loop);
@@ -250,8 +250,7 @@ gint32 main(gint32 argc, gchar *argv[])
        ret = 0;
 
 fail:
-       if (stc_emulator_is_emulated() == FALSE)
-               __stc_manager_deinit();
+       __stc_manager_deinit();
 
        if (main_loop)
                g_main_loop_unref(main_loop);