Added dbus method to commit iptables

Change-Id: I20c7623d92421a7d04c23e9a96ebc6708340f047
Signed-off-by: hyunuktak <hyunuk.tak@samsung.com>

diff --git a/include/stc-manager-gdbus.h b/include/stc-manager-gdbus.h
index 4b6a50f..b422b62 100755 (executable)
--- a/include/stc-manager-gdbus.h
+++ b/include/stc-manager-gdbus.h
@@ -83,4 +83,9 @@ gboolean stc_manager_dbus_emit_signal(GDBusConnection *connection,
 gboolean handle_manager_stop(StcManager *object,
                                          GDBusMethodInvocation *invocation);
 
+gboolean handle_manager_commit_iptables(StcManager *object,
+                                       GDBusMethodInvocation *invocation,
+                                       const gchar *option,
+                                       void *user_data);
+
 #endif /* __STC_MANAGER_GDBUS_H__ */

diff --git a/include/stc-manager.h b/include/stc-manager.h
index c6a8f8e..e084037 100755 (executable)
--- a/include/stc-manager.h
+++ b/include/stc-manager.h
@@ -31,6 +31,11 @@
 #define STC_TOTAL_IPV4 "TOTAL_IPV4"
 #define STC_TOTAL_IPV6 "TOTAL_IPV6"
 
+#define STC_IPTABLES "/usr/sbin/iptables"
+#define STC_IP6TABLES "/usr/sbin/ip6tables"
+
+#define STC_CMD_SIZE 256
+
 #define STC_DEBUG_LOG (stc_util_get_debuglog())
 
 typedef enum {
@@ -236,5 +241,6 @@ typedef struct {
 
 stc_s *stc_get_manager(void);
 void stc_stop_manager(void);
+int stc_commit_iptables(char *cmd, int *err_num, char **err_str);
 
 #endif /* __STC_MANAGER__ */

diff --git a/interfaces/stcmanager-iface-manager.xml b/interfaces/stcmanager-iface-manager.xml
index f5a9167..33697b4 100644 (file)
--- a/interfaces/stcmanager-iface-manager.xml
+++ b/interfaces/stcmanager-iface-manager.xml
@@ -3,5 +3,11 @@
                <method name='Stop'>
                        <arg type='i' name='error_code' direction='out'/>
                </method>
+               <method name='CommitIptables'>
+                       <arg type='s' name='option' direction='in'/>
+                       <arg type='i' name='error_code' direction='out'/>
+                       <arg type='i' name='error_num' direction='out'/>
+                       <arg type='s' name='error_str' direction='out'/>
+               </method>
        </interface>
 </node>

diff --git a/packaging/stc-manager.spec b/packaging/stc-manager.spec
index 6dca357..6ce22de 100644 (file)
--- a/packaging/stc-manager.spec
+++ b/packaging/stc-manager.spec
@@ -1,6 +1,6 @@
 Name:       stc-manager
 Summary:    STC(Smart Traffic Control) manager
-Version:    0.0.55
+Version:    0.0.56
 Release:    0
 Group:      Network & Connectivity/Other
 License:    Apache-2.0

diff --git a/src/stc-manager-gdbus.c b/src/stc-manager-gdbus.c
index 75b93b1..2abe2c1 100755 (executable)
--- a/src/stc-manager-gdbus.c
+++ b/src/stc-manager-gdbus.c
@@ -20,10 +20,31 @@
 #include "stc-restriction.h"
 #include "stc-firewall.h"
 #include "stc-default-connection.h"
+#include "stc-manager-util.h"
 #include "stc-manager-plugin-appstatus.h"
 #include "stc-manager-plugin-procfs.h"
 #include "helper-iptables.h"
 
+#define MANAGER_DBUS_ERROR_NAME "net.stc.manager.Error.Failed"
+
+#define STC_MANAGER_DBUS_REPLY_ERROR(invocation, err_num) \
+       g_dbus_method_invocation_return_dbus_error((invocation), \
+                                                  MANAGER_DBUS_ERROR_NAME, \
+                                                  stc_err_strs[-(err_num)])
+
+static const gchar *stc_err_strs[] = {
+       "ERROR_NONE",
+       "FAIL",
+       "DB_FAILED",
+       "OUT_OF_MEMORY",
+       "INVALID_PARAMETER",
+       "NO_DATA",
+       "ALREADY_DATA",
+       "UNINITIALIZED",
+       "PERMISSION_DENIED",
+       "NOTIMPL"
+};
+
 static gboolean __stc_manager_gdbus_statistics_init(stc_s *stc)
 {
        __STC_LOG_FUNC_ENTER__;
@@ -234,6 +255,9 @@ static gboolean __stc_manager_gdbus_manager_init(stc_s *stc)
        g_signal_connect(manager, "handle-stop",
                         G_CALLBACK(handle_manager_stop), stc);
 
+       g_signal_connect(manager, "handle-commit-iptables",
+                        G_CALLBACK(handle_manager_commit_iptables), stc);
+
        g_dbus_object_manager_server_export(stc->obj_mgr,
                                            G_DBUS_OBJECT_SKELETON(object));
        g_object_unref(object);
@@ -494,3 +518,36 @@ gboolean handle_manager_stop(StcManager *object,
        __STC_LOG_FUNC_EXIT__;
        return TRUE;
 }
+
+gboolean handle_manager_commit_iptables(StcManager *object,
+                                       GDBusMethodInvocation *invocation,
+                                       const gchar *option,
+                                       void *user_data)
+{
+       __STC_LOG_FUNC_ENTER__;
+       GVariant *return_parameters = NULL;
+       int ret = STC_ERROR_NONE;
+       int err_num = 0;
+       char *err_str = NULL;
+       char cmd[STC_CMD_SIZE] = { 0, };
+
+       if (option == NULL) {
+               STC_MANAGER_DBUS_REPLY_ERROR(invocation,
+                                                STC_ERROR_INVALID_PARAMETER);
+               __STC_LOG_FUNC_EXIT__;
+               return TRUE;
+       }
+
+       STC_LOGD("[%s]", option);
+       g_snprintf(cmd, STC_CMD_SIZE, "%s %s", STC_IPTABLES, option);
+
+       ret = stc_commit_iptables(cmd, &err_num, &err_str);
+
+       return_parameters = g_variant_new("(iis)", ret, err_num, err_str);
+
+       DEBUG_GDBUS_VARIANT("Return parameters: ", return_parameters);
+       STC_DBUS_REPLY(invocation, return_parameters);
+
+       __STC_LOG_FUNC_EXIT__;
+       return TRUE;
+}

diff --git a/src/stc-manager.c b/src/stc-manager.c
index 0da9bf4..799839e 100755 (executable)
--- a/src/stc-manager.c
+++ b/src/stc-manager.c
@@ -15,6 +15,8 @@
  */
 
 #include <signal.h>
+#include <errno.h>
+#include <sys/wait.h>
 #include "stc-manager.h"
 #include "stc-emulator.h"
 #include "stc-manager-gdbus.h"
@@ -30,6 +32,8 @@
 #include "stc-manager-plugin-exception.h"
 #include "stc-manager-plugin-procfs.h"
 
+#define BUF_SIZE_FOR_ERR 100
+
 static stc_s *g_stc = NULL;
 
 /*
@@ -129,6 +133,65 @@ void stc_stop_manager(void)
                g_main_loop_quit(g_stc->main_loop);
 }
 
+int stc_commit_iptables(char *cmd, int *err_num, char **err_str)
+{
+       pid_t pid = 0;
+       int status = 0;
+       int ret = 0;
+       char err_buf[BUF_SIZE_FOR_ERR] = { 0, };
+       gchar **args = NULL;
+
+       if (cmd == NULL) {
+               STC_LOGE("Invalid arguments");
+               return STC_ERROR_INVALID_PARAMETER;
+       }
+
+       args = g_strsplit_set(cmd, " ", -1);
+
+       errno = 0;
+       pid = fork();
+
+       if (pid == 0) {
+               errno = 0;
+               if (execv(args[0], args) == -1) {
+                       STC_LOGE("Failed to execute [%s]", err_str);
+                       g_strfreev(args);
+                       exit(-1);
+               }
+       } else if (pid > 0) {
+               if (waitpid(pid, &status, 0) == -1)
+                       STC_LOGD("wait pid [%u] status [%d] ", pid, status);
+
+               if (WIFEXITED(status)) {
+                       ret = WEXITSTATUS(status);
+                       STC_LOGD("exited, status [%d]", status);
+               } else if (WIFSIGNALED(status)) {
+                       STC_LOGD("killed by signal [%d]", WTERMSIG(status));
+               } else if (WIFSTOPPED(status)) {
+                       STC_LOGD("stopped by signal [%d]", WSTOPSIG(status));
+               } else if (WIFCONTINUED(status)) {
+                       STC_LOGD("continued");
+               }
+
+               *err_num = ret;
+               *err_str = strerror_r(ret, err_buf, BUF_SIZE_FOR_ERR);
+               STC_LOGD("return err_num [%d] err_str [%s]", *err_num, *err_str);
+
+               g_strfreev(args);
+               if (ret == 0)
+                       return STC_ERROR_NONE;
+               else
+                       return STC_ERROR_FAIL;
+       }
+
+       *err_num = errno;
+       *err_str = strerror_r(errno, err_buf, BUF_SIZE_FOR_ERR);
+       STC_LOGD("Failed to fork [%d:%s]", *err_num, *err_str);
+
+       g_strfreev(args);
+       return STC_ERROR_FAIL;
+}
+
 gint32 main(gint32 argc, gchar *argv[])
 {
        GMainLoop *main_loop = NULL;