From 725ea87c2443261a451de6a6f12aa48bab76fd9f Mon Sep 17 00:00:00 2001 From: Seonah Moon Date: Wed, 29 Aug 2018 10:31:14 +0900 Subject: [PATCH] Fix dbus methods for mptcp Change-Id: Ice73114dcbb230b02f493dba648f15b591195d24 --- gtest/gdbus.h | 14 +++--- include/mptcp-internal.h | 2 +- interfaces/netconfig-iface-mptcp.xml | 21 ++++---- resources/etc/dbus-1/system.d/net-config.conf | 10 ++-- src/mptcp-internal.c | 2 +- src/mptcp.c | 70 +++++++++------------------ 6 files changed, 51 insertions(+), 68 deletions(-) diff --git a/gtest/gdbus.h b/gtest/gdbus.h index 06e83f7..6008b70 100755 --- a/gtest/gdbus.h +++ b/gtest/gdbus.h @@ -120,13 +120,13 @@ #define NETCONFIG_MPTCP_PATH "/net/netconfig/mptcp" #define NETCONFIG_MPTCP_INTERFACE "net.netconfig.mptcp" -#define MPTCP_SUPPORTED "MptcpSupported" -#define MPTCP_SET_ENABLE "MptcpSetEnable" -#define MPTCP_GET_ENABLED "MptcpGetEnabled" -#define MPTCP_SET_PATH_MANAGER "MptcpSetPathManager" -#define MPTCP_GET_PATH_MANAGER "MptcpGetPathManager" -#define MPTCP_SET_SCHEDULER "MptcpSetScheduler" -#define MPTCP_GET_SCHEDULER "MptcpGetScheduler" +#define MPTCP_SUPPORTED "IsSupported" +#define MPTCP_SET_ENABLE "SetEnabled" +#define MPTCP_GET_ENABLED "GetEnabled" +#define MPTCP_SET_PATH_MANAGER "SetPathManager" +#define MPTCP_GET_PATH_MANAGER "GetPathManager" +#define MPTCP_SET_SCHEDULER "SetScheduler" +#define MPTCP_GET_SCHEDULER "GetScheduler" /* network statistics */ #define NETCONFIG_NETWORK_STATISTICS_PATH "/net/netconfig/network_statistics" diff --git a/include/mptcp-internal.h b/include/mptcp-internal.h index 1be9209..5beaac7 100755 --- a/include/mptcp-internal.h +++ b/include/mptcp-internal.h @@ -21,7 +21,7 @@ #define __NETCONFIG_MPTCP_INTERNAL_H__ gboolean mptcp_supported(); -gboolean mptcp_set_enable(gint enable); +gboolean mptcp_set_enabled(gint enable); gint mptcp_get_enabled(); gboolean mptcp_set_path_manager(const gchar* pm); gchar* mptcp_get_path_manager(); diff --git a/interfaces/netconfig-iface-mptcp.xml b/interfaces/netconfig-iface-mptcp.xml index e010c18..dc185ee 100755 --- a/interfaces/netconfig-iface-mptcp.xml +++ b/interfaces/netconfig-iface-mptcp.xml @@ -1,25 +1,28 @@ - + - - - - + - + + + + + + - + - + + - + diff --git a/resources/etc/dbus-1/system.d/net-config.conf b/resources/etc/dbus-1/system.d/net-config.conf index 7eba9fe..45797dd 100755 --- a/resources/etc/dbus-1/system.d/net-config.conf +++ b/resources/etc/dbus-1/system.d/net-config.conf @@ -34,9 +34,13 @@ - - - + + + + + + + diff --git a/src/mptcp-internal.c b/src/mptcp-internal.c index 72223d1..69bdf7b 100755 --- a/src/mptcp-internal.c +++ b/src/mptcp-internal.c @@ -75,7 +75,7 @@ gboolean mptcp_supported() return g_file_test(NET_PROC_SYS_NET_MPTCP, G_FILE_TEST_EXISTS); } -gboolean mptcp_set_enable(gint enable) +gboolean mptcp_set_enabled(gint enable) { const char* sysctlname = "mptcp_enabled"; char buf[2]; diff --git a/src/mptcp.c b/src/mptcp.c index 2117b8e..af63de1 100755 --- 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 TRUE; - } - - 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 TRUE; - } - 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 TRUE; - } - - 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 TRUE; - } - - 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 TRUE; - } - - 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 TRUE; - } - - 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, -- 2.7.4