Refactor functions for mptcp

Change-Id: Ie4e4bc11d886d767d5becf4504f29de31292e335

diff --git a/include/mptcp/network-mptcp-intf.h b/include/mptcp/network-mptcp-intf.h
index 9219042..adbaa08 100644 (file)
--- a/include/mptcp/network-mptcp-intf.h
+++ b/include/mptcp/network-mptcp-intf.h
@@ -30,7 +30,7 @@ extern "C" {
 
 int net_mptcp_supported(gboolean* support);
 
-int net_mptcp_set_enable(int enable);
+int net_mptcp_set_enabled(int enable);
 int net_mptcp_get_enabled(int* enable);
 
 int net_mptcp_set_path_manager(const char *pm);

diff --git a/src/include/network-dbus-request.h b/src/include/network-dbus-request.h
index e906991..a63ceaf 100755 (executable)
--- a/src/include/network-dbus-request.h
+++ b/src/include/network-dbus-request.h
@@ -148,7 +148,7 @@ int _net_dbus_device_policy_get_wifi(int *state);
 int _net_dbus_device_policy_get_wifi_profile(int *state);
 
 int _net_dbus_mptcp_supported(gboolean* support);
-int _net_dbus_mptcp_set_enable(int enable);
+int _net_dbus_mptcp_set_enabled(int enable);
 int _net_dbus_mptcp_get_enabled(int* enable);
 int _net_dbus_mptcp_set_path_manager(const char *pm);
 int _net_dbus_mptcp_get_path_manager(char **pm);

diff --git a/src/network-dbus-request.c b/src/network-dbus-request.c
index 09ded1e..5097fa8 100755 (executable)
--- a/src/network-dbus-request.c
+++ b/src/network-dbus-request.c
@@ -2860,7 +2860,7 @@ int _net_dbus_mptcp_supported(gboolean* support)
        GVariant *message = NULL;
 
        message = _net_invoke_dbus_method(NETCONFIG_SERVICE, NETCONFIG_MPTCP_PATH,
-                       NETCONFIG_MPTCP_INTERFACE, "MptcpSupported", NULL, &Error);
+                       NETCONFIG_MPTCP_INTERFACE, "IsSupported", NULL, &Error);
 
        if (message == NULL) {
                NETWORK_LOG(NETWORK_ERROR, "Failed to get MPTCP enabled");
@@ -2875,23 +2875,27 @@ int _net_dbus_mptcp_supported(gboolean* support)
        return Error;
 }
 
-int _net_dbus_mptcp_set_enable(int enable)
+int _net_dbus_mptcp_set_enabled(int enable)
 {
        __NETWORK_FUNC_ENTER__;
        net_err_t Error = NET_ERR_NONE;
        GVariant *message = NULL;
        GVariant *params;
+       gboolean result = FALSE;
 
        params = g_variant_new("(i)", enable);
 
        message = _net_invoke_dbus_method(NETCONFIG_SERVICE, NETCONFIG_MPTCP_PATH,
-                       NETCONFIG_MPTCP_INTERFACE, "MptcpSetEnable", params, &Error);
-
-       if (Error != NET_ERR_NONE)
-               NETWORK_LOG(NETWORK_ERROR, "_net_invoke_dbus_method failed");
+                       NETCONFIG_MPTCP_INTERFACE, "SetEnabled", params, &Error);
+       if (Error == NET_ERR_NONE) {
+               if (message != NULL) {
+                       g_variant_get(message, "(b)", &result);
+                       if (!result)
+                               Error = NET_ERR_INVALID_PARAM;
+               }
+       }
 
-       if (message != NULL)
-               g_variant_unref(message);
+       g_variant_unref(message);
 
        __NETWORK_FUNC_EXIT__;
        return Error;
@@ -2904,7 +2908,7 @@ int _net_dbus_mptcp_get_enabled(int* enable)
        GVariant *message = NULL;
 
        message = _net_invoke_dbus_method(NETCONFIG_SERVICE, NETCONFIG_MPTCP_PATH,
-                       NETCONFIG_MPTCP_INTERFACE, "MptcpGetEnabled", NULL, &Error);
+                       NETCONFIG_MPTCP_INTERFACE, "GetEnabled", NULL, &Error);
 
        if (message == NULL) {
                NETWORK_LOG(NETWORK_ERROR, "Failed to get MPTCP enabled");
@@ -2925,16 +2929,21 @@ int _net_dbus_mptcp_set_path_manager(const char *pm)
        net_err_t Error = NET_ERR_NONE;
        GVariant *message = NULL;
        GVariant *params;
+       gboolean result = FALSE;
 
        params = g_variant_new("(s)", pm);
 
        message = _net_invoke_dbus_method(NETCONFIG_SERVICE, NETCONFIG_MPTCP_PATH,
-                       NETCONFIG_MPTCP_INTERFACE, "MptcpSetPathManager", params, &Error);
-       if (Error != NET_ERR_NONE)
-               NETWORK_LOG(NETWORK_ERROR, "_net_invoke_dbus_method failed");
+                       NETCONFIG_MPTCP_INTERFACE, "SetPathManager", params, &Error);
+       if (Error == NET_ERR_NONE) {
+               if (message != NULL) {
+                       g_variant_get(message, "(b)", &result);
+                       if (!result)
+                               Error = NET_ERR_INVALID_PARAM;
+               }
+       }
 
-       if (message != NULL)
-               g_variant_unref(message);
+       g_variant_unref(message);
 
        __NETWORK_FUNC_EXIT__;
        return Error;
@@ -2947,7 +2956,7 @@ int _net_dbus_mptcp_get_path_manager(char **pm)
        GVariant *message = NULL;
 
        message = _net_invoke_dbus_method(NETCONFIG_SERVICE, NETCONFIG_MPTCP_PATH,
-                       NETCONFIG_MPTCP_INTERFACE, "MptcpGetPathManager", NULL, &Error);
+                       NETCONFIG_MPTCP_INTERFACE, "GetPathManager", NULL, &Error);
 
        if (message == NULL) {
                NETWORK_LOG(NETWORK_ERROR, "Failed to get MPTCP path manager");
@@ -2969,16 +2978,21 @@ int _net_dbus_mptcp_set_scheduler(const char *scheduler)
        net_err_t Error = NET_ERR_NONE;
        GVariant *message = NULL;
        GVariant *params;
+       gboolean result = FALSE;
 
        params = g_variant_new("(s)", scheduler);
 
        message = _net_invoke_dbus_method(NETCONFIG_SERVICE, NETCONFIG_MPTCP_PATH,
-                       NETCONFIG_MPTCP_INTERFACE, "MptcpSetScheduler", params, &Error);
-       if (Error != NET_ERR_NONE)
-               NETWORK_LOG(NETWORK_ERROR, "_net_invoke_dbus_method failed");
+                       NETCONFIG_MPTCP_INTERFACE, "SetScheduler", params, &Error);
+       if (Error == NET_ERR_NONE) {
+               if (message != NULL) {
+                       g_variant_get(message, "(b)", &result);
+                       if (!result)
+                               Error = NET_ERR_INVALID_PARAM;
+               }
+       }
 
-       if (message != NULL)
-               g_variant_unref(message);
+       g_variant_unref(message);
 
        __NETWORK_FUNC_EXIT__;
        return Error;
@@ -2991,7 +3005,7 @@ int _net_dbus_mptcp_get_scheduler(char **scheduler)
        GVariant *message = NULL;
 
        message = _net_invoke_dbus_method(NETCONFIG_SERVICE, NETCONFIG_MPTCP_PATH,
-                       NETCONFIG_MPTCP_INTERFACE, "MptcpGetScheduler", NULL, &Error);
+                       NETCONFIG_MPTCP_INTERFACE, "GetScheduler", NULL, &Error);
 
        if (message == NULL) {
                NETWORK_LOG(NETWORK_ERROR, "Failed to get MPTCP path manager");

diff --git a/src/network-mptcp-intf.c b/src/network-mptcp-intf.c
index 7e4e29c..4a4960f 100644 (file)
--- a/src/network-mptcp-intf.c
+++ b/src/network-mptcp-intf.c
@@ -38,12 +38,12 @@ EXPORT_API int net_mptcp_supported(gboolean* support)
        return Error;
 }
 
-EXPORT_API int net_mptcp_set_enable(int enable)
+EXPORT_API int net_mptcp_set_enabled(int enable)
 {
        __NETWORK_FUNC_ENTER__;
        net_err_t Error = NET_ERR_NONE;
 
-       Error = _net_dbus_mptcp_set_enable(enable);
+       Error = _net_dbus_mptcp_set_enabled(enable);
        if (Error != NET_ERR_NONE)
                NETWORK_LOG(NETWORK_ERROR, "net_mptcp_set_enable failed\n");