Modify send_arp

[platform/core/connectivity/net-config.git] / src / mptcp.c

diff --git a/src/mptcp.c b/src/mptcp.c
index 25c679d..af63de1 100755 (executable)
--- a/src/mptcp.c
+++ b/src/mptcp.c
@@ -44,20 +44,16 @@ gboolean handle_mptcp_supported(Mptcp *object, GDBusMethodInvocation *invocation
 
        value = mptcp_supported();
 
-       mptcp_complete_mptcp_supported(object, invocation, value);
+       mptcp_complete_is_supported(object, invocation, value);
        return TRUE;
 }
 
-gboolean handle_mptcp_set_enable(Mptcp *object, GDBusMethodInvocation *invocation, gint enable)
+gboolean handle_mptcp_set_enabled(Mptcp *object, GDBusMethodInvocation *invocation, gint enable)
 {
-       DBG("handle_mptcp_set_enable");
+       DBG("handle_mptcp_set_enabled");
 
-       if (mptcp_set_enable(enable) == FALSE) {
-               ERR("Fail to set mptcp_enabled[%d]", enable);
-               return FALSE;
-       }
-
-       mptcp_complete_mptcp_set_enable(object, invocation);
+       gboolean ret = mptcp_set_enabled(enable);
+       mptcp_complete_set_enabled(object, invocation, ret);
        return TRUE;
 }
 
@@ -67,12 +63,10 @@ gboolean handle_mptcp_get_enabled(Mptcp *object, GDBusMethodInvocation *invocati
        gint value;
 
        value = mptcp_get_enabled();
-       if (value != 0 && value != 1 && value != 2) {
+       if (value != 0 && value != 1 && value != 2)
                ERR("Invalid value of mptcp_enabled[%d]", value);
-               return FALSE;
-       }
 
-       mptcp_complete_mptcp_get_enabled(object, invocation, value);
+       mptcp_complete_get_enabled(object, invocation, value);
        return TRUE;
 }
 
@@ -80,12 +74,8 @@ gboolean handle_mptcp_set_path_manager(Mptcp *object, GDBusMethodInvocation *inv
 {
        DBG("handle_mptcp_set_path_manager %s", pm);
 
-       if (mptcp_set_path_manager(pm) == FALSE) {
-               ERR("Fail to set mptcp_path_manager[%d]", pm);
-               return FALSE;
-       }
-
-       mptcp_complete_mptcp_set_path_manager(object, invocation);
+       gboolean ret = mptcp_set_path_manager(pm);
+       mptcp_complete_set_path_manager(object, invocation, ret);
        return TRUE;
 }
 
@@ -95,13 +85,8 @@ gboolean handle_mptcp_get_path_manager(Mptcp *object, GDBusMethodInvocation *inv
        gchar* pm;
 
        pm = mptcp_get_path_manager();
-       if (pm == NULL) {
-               ERR("Fail to get mptcp_path_manager");
-               return FALSE;
-       }
-
-       DBG("get path manager %s", pm);
-       mptcp_complete_mptcp_get_path_manager(object, invocation, pm);
+       DBG("get path manager %s", pm ? pm : "null");
+       mptcp_complete_get_path_manager(object, invocation, pm);
        g_free(pm);
 
        return TRUE;
@@ -111,12 +96,8 @@ gboolean handle_mptcp_set_scheduler(Mptcp *object, GDBusMethodInvocation *invoca
 {
        DBG("handle_mptcp_set_scheduler");
 
-       if (mptcp_mptcp_set_scheduler(scheduler) == FALSE) {
-               ERR("Fail to set mptcp_scheduler[%s]", scheduler);
-               return FALSE;
-       }
-
-       mptcp_complete_mptcp_set_scheduler(object, invocation);
+       gboolean ret = mptcp_mptcp_set_scheduler(scheduler);
+       mptcp_complete_set_scheduler(object, invocation, ret);
        return TRUE;
 }
 
@@ -126,13 +107,8 @@ gboolean handle_mptcp_get_scheduler(Mptcp *object, GDBusMethodInvocation *invoca
        gchar* scheduler;
 
        scheduler = mptcp_get_scheduler();
-       if (scheduler == NULL) {
-               ERR("Fail to get mptcp_scheduler");
-               return FALSE;
-       }
-
-       DBG("get scheduler %s", scheduler);
-       mptcp_complete_mptcp_get_scheduler(object, invocation, scheduler);
+       DBG("get scheduler %s", scheduler ? scheduler : "null");
+       mptcp_complete_get_scheduler(object, invocation, scheduler);
        g_free(scheduler);
 
        return TRUE;
@@ -159,19 +135,19 @@ void mptcp_object_create_and_init(void)
        interface_mptcp = G_DBUS_INTERFACE_SKELETON(mptcp_object);
 
        /* VPN Service */
-       g_signal_connect(mptcp_object, "handle-mptcp-supported",
+       g_signal_connect(mptcp_object, "handle-is-supported",
                        G_CALLBACK(handle_mptcp_supported), NULL);
-       g_signal_connect(mptcp_object, "handle-mptcp-set-enable",
-                       G_CALLBACK(handle_mptcp_set_enable), NULL);
-       g_signal_connect(mptcp_object, "handle-mptcp-get-enabled",
+       g_signal_connect(mptcp_object, "handle-set-enabled",
+                       G_CALLBACK(handle_mptcp_set_enabled), NULL);
+       g_signal_connect(mptcp_object, "handle-get-enabled",
                        G_CALLBACK(handle_mptcp_get_enabled), NULL);
-       g_signal_connect(mptcp_object, "handle-mptcp-set-path-manager",
+       g_signal_connect(mptcp_object, "handle-set-path-manager",
                        G_CALLBACK(handle_mptcp_set_path_manager), NULL);
-       g_signal_connect(mptcp_object, "handle-mptcp-get-path-manager",
+       g_signal_connect(mptcp_object, "handle-get-path-manager",
                        G_CALLBACK(handle_mptcp_get_path_manager), NULL);
-       g_signal_connect(mptcp_object, "handle-mptcp-set-scheduler",
+       g_signal_connect(mptcp_object, "handle-set-scheduler",
                        G_CALLBACK(handle_mptcp_set_scheduler), NULL);
-       g_signal_connect(mptcp_object, "handle-mptcp-get-scheduler",
+       g_signal_connect(mptcp_object, "handle-get-scheduler",
                        G_CALLBACK(handle_mptcp_get_scheduler), NULL);
 
        if (!g_dbus_interface_skeleton_export(interface_mptcp, connection,