Modify internal name for checking gateway

Change-Id: I63e5976c068d9b67b239d66695b93d2c2f0daaec
Signed-off-by: Yu Jiung <jiung.yu@samsung.com>

diff --git a/include/inm-manager.h b/include/inm-manager.h
index f39d0801b95f6238b2f638b5c609d9f9b6f08af3..64fd9a9e8d2d785dc65c224925338b27a3084ff3 100644 (file)
--- a/include/inm-manager.h
+++ b/include/inm-manager.h
@@ -99,8 +99,8 @@ int inm_manager_set_arp_packet_interval(int interval);
 int inm_manager_get_arp_packet_interval(int *interval);
 int inm_manager_arp_request_start(char *target_ip);
 int inm_manager_arp_request_stop(char *target_ip);
-int inm_manager_start_check_gateway();
-int inm_manager_stop_check_gateway();
+int inm_manager_default_gateway_start_checking(int timeout);
+int inm_manager_default_gateway_stop_checking();
 int inm_manager_add_reacher_url(const char *url);
 int inm_manager_remove_reacher_url(const char *url);
 int inm_manager_start_reacher(int type);

diff --git a/packaging/dbus-inm-manager.conf b/packaging/dbus-inm-manager.conf
index a49bea7dd1347c87fbf98bcd6c2db8d6e7644956..23f6845143f61c78877c7313611910e90357bf86 100644 (file)
--- a/packaging/dbus-inm-manager.conf
+++ b/packaging/dbus-inm-manager.conf
@@ -32,6 +32,8 @@
                <check send_destination="net.inm_manager" send_interface="net.inm_manager" send_member="GetArpPacketInterval" privilege="http://tizen.org/privilege/network.get" />
                <check send_destination="net.inm_manager" send_interface="net.inm_manager" send_member="ArpRequestStart" privilege="http://tizen.org/privilege/network.get" />
                <check send_destination="net.inm_manager" send_interface="net.inm_manager" send_member="ArpRequestStop" privilege="http://tizen.org/privilege/network.get" />
+               <check send_destination="net.inm_manager" send_interface="net.inm_manager" send_member="DefaultGatewayStartChecking" privilege="http://tizen.org/privilege/network.get" />
+               <check send_destination="net.inm_manager" send_interface="net.inm_manager" send_member="DefaultGatewayStopChecking" privilege="http://tizen.org/privilege/network.get" />
                <check send_destination="net.inm_manager" send_interface="net.inm_manager" send_member="GetWifiState" privilege="http://tizen.org/privilege/network.get" />
                <check send_destination="net.inm_manager" send_interface="net.inm_manager" send_member="GetEthernetState" privilege="http://tizen.org/privilege/network.get" />
                <check send_destination="net.inm_manager" send_interface="net.inm_manager" send_member="GetCurrentConnection" privilege="http://tizen.org/privilege/network.get" />

diff --git a/src/inm-gdbus.c b/src/inm-gdbus.c
index 72a75832c107e0a04724778c104bd1b731ace672..b817beb6fd01fc3233d57865cf64979949329249 100644 (file)
--- a/src/inm-gdbus.c
+++ b/src/inm-gdbus.c
@@ -850,14 +850,16 @@ static inline void __handle_arp_request_stop(GVariant *parameters,
        __INM_FUNC_EXIT__;
 }
 
-static inline void __handle_start_check_gateway(GVariant *parameters,
+static inline void __handle_default_gateway_start_checking(GVariant *parameters,
                GDBusMethodInvocation *invocation)
 {
+       int timeout = 0;
        int ret = INM_MANAGER_ERROR_NONE;
 
        __INM_FUNC_ENTER__;
 
-       ret = inm_manager_start_check_gateway();
+       g_variant_get(parameters, "(i)", &timeout);
+       ret = inm_manager_default_gateway_start_checking(timeout);
        if (ret != INM_MANAGER_ERROR_NONE) {
                __dbus_return_err(ret, invocation);
                return;
@@ -867,14 +869,14 @@ static inline void __handle_start_check_gateway(GVariant *parameters,
        __INM_FUNC_EXIT__;
 }
 
-static inline void __handle_stop_check_gateway(GVariant *parameters,
+static inline void __handle_default_gateway_stop_checking(GVariant *parameters,
                GDBusMethodInvocation *invocation)
 {
        int ret = INM_MANAGER_ERROR_NONE;
 
        __INM_FUNC_ENTER__;
 
-       ret = inm_manager_stop_check_gateway();
+       ret = inm_manager_default_gateway_stop_checking();
        if (ret != INM_MANAGER_ERROR_NONE) {
                __dbus_return_err(ret, invocation);
                return;
@@ -1051,10 +1053,10 @@ static void __daemon_method_call(GDBusConnection *connection,
                __handle_arp_request_start(parameters, invocation);
        else if (g_strcmp0(method_name, "ArpRequestStop") == 0)
                __handle_arp_request_stop(parameters, invocation);
-       else if (g_strcmp0(method_name, "StartCheckGateway") == 0)
-               __handle_start_check_gateway(parameters, invocation);
-       else if (g_strcmp0(method_name, "StopCheckGateway") == 0)
-               __handle_stop_check_gateway(parameters, invocation);
+       else if (g_strcmp0(method_name, "DefaultGatewayStartChecking") == 0)
+               __handle_default_gateway_start_checking(parameters, invocation);
+       else if (g_strcmp0(method_name, "DefaultGatewayStopChecking") == 0)
+               __handle_default_gateway_stop_checking(parameters, invocation);
        else if (g_strcmp0(method_name, "AddReacherUrl") == 0)
                __handle_add_reacher_url(parameters, invocation);
        else if (g_strcmp0(method_name, "RemoveReacherUrl") == 0)
@@ -1457,9 +1459,10 @@ static void __init_daemon_introspection()
                        "<method name='ArpRequestStop'>"
                                "<arg type='s' name='target_ip' direction='in'/>"
                                "</method>"
-                       "<method name='StartCheckGateway'>"
+                       "<method name='DefaultGatewayStartChecking'>"
+                               "<arg type='i' name='time_out' direction='in'/>"
                                "</method>"
-                       "<method name='StopCheckGateway'>"
+                       "<method name='DefaultGatewayStopChecking'>"
                                "</method>"
                        "<method name='AddReacherUrl'>"
                                "<arg type='s' name='url' direction='in'/>"

diff --git a/src/inm-manager.c b/src/inm-manager.c
index 37e781300ffbb605b276f4bfa19a2f71ac44849a..30ba3121840375afc0adbca9acf0e069d0938674 100644 (file)
--- a/src/inm-manager.c
+++ b/src/inm-manager.c
@@ -368,7 +368,7 @@ int inm_manager_arp_request_stop(char *target_ip)
        return ret;
 }
 
-int inm_manager_start_check_gateway()
+int inm_manager_default_gateway_start_checking(int timeout)
 {
        gchar *ifname;
        gchar *gateway_ip;
@@ -390,7 +390,7 @@ int inm_manager_start_check_gateway()
                return -1;
        }
 
-       ret = inm_arping_start(ifname, gateway_ip, GATEWAY_CHECK_TIMEOUT, TRUE);
+       ret = inm_arping_start(ifname, gateway_ip, timeout, TRUE);
        if (ret != 0) {
                INM_LOGW("Failed to start arping");
 
@@ -407,7 +407,7 @@ int inm_manager_start_check_gateway()
        return ret;
 }
 
-int inm_manager_stop_check_gateway()
+int inm_manager_default_gateway_stop_checking()
 {
        gchar *ifname;
        gchar *gateway_ip;