Modify internal name for ARP Request

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

diff --git a/include/inm-gdbus.h b/include/inm-gdbus.h
index 8ae8295a99ee50201fcb8ff0d4df91a10b4de874..cf747dd7a3d4c8ddc41401bb63039828b8d14bd6 100644 (file)
--- a/include/inm-gdbus.h
+++ b/include/inm-gdbus.h
@@ -146,7 +146,7 @@ gboolean inm_gdbus_emit_signal(const gchar *destination_bus_name,
                GVariant *params);
 
 void inm_gdbus_emit_ip_conflicted(int state, gchar *if_name, gchar *ip);
-void inm_gdbus_emit_arping_result(gboolean found, gchar *ip);
+void inm_gdbus_emit_arp_request_result(gboolean found, gchar *ip);
 void inm_gdbus_emit_gateway_check_result(gboolean found, gchar *ip);
 void inm_gdbus_emit_reacher_result(gboolean found, const gchar *url);
 void inm_gdbus_emit_ethernet_cable_state(gboolean state);

diff --git a/include/inm-manager.h b/include/inm-manager.h
index ae2410d6d35ad05650c7cbee0dce226ae1d7148b..f39d0801b95f6238b2f638b5c609d9f9b6f08af3 100644 (file)
--- a/include/inm-manager.h
+++ b/include/inm-manager.h
@@ -97,8 +97,8 @@ int inm_manager_get_ethernet_state(int *state);
 
 int inm_manager_set_arp_packet_interval(int interval);
 int inm_manager_get_arp_packet_interval(int *interval);
-int inm_manager_start_arping(char *target_ip, int timeout);
-int inm_manager_stop_arping(char *target_ip);
+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_add_reacher_url(const char *url);

diff --git a/packaging/dbus-inm-manager.conf b/packaging/dbus-inm-manager.conf
index 699f3f8f14327ac364c6c6927b024a20f9ff9bfa..a49bea7dd1347c87fbf98bcd6c2db8d6e7644956 100644 (file)
--- a/packaging/dbus-inm-manager.conf
+++ b/packaging/dbus-inm-manager.conf
@@ -30,6 +30,8 @@
                <check send_destination="net.inm_manager" send_interface="net.inm_manager" send_member="GetChannelInterference" privilege="http://tizen.org/privilege/network.get" />
                <check send_destination="net.inm_manager" send_interface="net.inm_manager" send_member="SetArpPacketInterval" privilege="http://tizen.org/privilege/network.get" />
                <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="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-arping.c b/src/inm-arping.c
index 0118b45b7e81955cc0422d7310a9a6ec6c71b93e..79ecff6c9a1578ac50aa25e2353a292f0d43771a 100644 (file)
--- a/src/inm-arping.c
+++ b/src/inm-arping.c
@@ -343,10 +343,13 @@ int inm_arping_start(gchar *if_name, gchar *target_ip, gint timeout, gboolean is
                return INM_ARPING_ERROR_OPERATION_FAILED;
        }
 
-       arping_data->arp_user_timer_source_id =
-                       g_timeout_add(arping_data->user_timeout * MSEC,
-                                       __arp_user_timeout_cb,
-                                       arping_data);
+       if (timeout != 0) {
+               REMOVE_G_SOURCE(arping_data->arp_user_timer_source_id);
+               arping_data->arp_user_timer_source_id =
+                               g_timeout_add(arping_data->user_timeout * MSEC,
+                                               __arp_user_timeout_cb,
+                                               arping_data);
+       }
 
        g_p_arping_mon->in_progress =  TRUE;
        __INM_FUNC_EXIT__;

diff --git a/src/inm-gdbus.c b/src/inm-gdbus.c
index ab3c10f58ce2bcb00dbaccd5dc9f416f4c2600bc..72a75832c107e0a04724778c104bd1b731ace672 100644 (file)
--- a/src/inm-gdbus.c
+++ b/src/inm-gdbus.c
@@ -812,18 +812,17 @@ static inline void __handle_get_arp_packet_interval(GVariant *parameters,
        __INM_FUNC_EXIT__;
 }
 
-static inline void __handle_start_arping(GVariant *parameters,
+static inline void __handle_arp_request_start(GVariant *parameters,
                GDBusMethodInvocation *invocation)
 {
        gchar *target_ip = NULL;
-       int timeout;
        int ret = INM_MANAGER_ERROR_NONE;
 
        __INM_FUNC_ENTER__;
 
-       g_variant_get(parameters, "(&si)", &target_ip, &timeout);
+       g_variant_get(parameters, "(&s)", &target_ip);
 
-       ret = inm_manager_start_arping(target_ip, timeout);
+       ret = inm_manager_arp_request_start(target_ip);
        if (ret != INM_MANAGER_ERROR_NONE) {
                __dbus_return_err(ret, invocation);
                return;
@@ -833,7 +832,7 @@ static inline void __handle_start_arping(GVariant *parameters,
        __INM_FUNC_EXIT__;
 }
 
-static inline void __handle_stop_arping(GVariant *parameters,
+static inline void __handle_arp_request_stop(GVariant *parameters,
                GDBusMethodInvocation *invocation)
 {
        gchar *target_ip = NULL;
@@ -841,7 +840,7 @@ static inline void __handle_stop_arping(GVariant *parameters,
 
        __INM_FUNC_ENTER__;
        g_variant_get(parameters, "(&s)", &target_ip);
-       ret = inm_manager_stop_arping(target_ip);
+       ret = inm_manager_arp_request_stop(target_ip);
        if (ret != INM_MANAGER_ERROR_NONE) {
                __dbus_return_err(ret, invocation);
                return;
@@ -1048,10 +1047,10 @@ static void __daemon_method_call(GDBusConnection *connection,
                __handle_set_arp_packet_interval(parameters, invocation);
        else if (g_strcmp0(method_name, "GetArpPacketInterval") == 0)
                __handle_get_arp_packet_interval(parameters, invocation);
-       else if (g_strcmp0(method_name, "StartArping") == 0)
-               __handle_start_arping(parameters, invocation);
-       else if (g_strcmp0(method_name, "StopArping") == 0)
-               __handle_stop_arping(parameters, invocation);
+       else if (g_strcmp0(method_name, "ArpRequestStart") == 0)
+               __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)
@@ -1101,7 +1100,7 @@ void inm_gdbus_emit_ip_conflicted(int state, gchar *if_name, gchar *ip)
        __INM_FUNC_EXIT__;
 }
 
-void inm_gdbus_emit_arping_result(gboolean found, gchar *ip)
+void inm_gdbus_emit_arp_request_result(gboolean found, gchar *ip)
 {
        GVariantBuilder *builder = NULL;
 
@@ -1113,7 +1112,7 @@ void inm_gdbus_emit_arping_result(gboolean found, gchar *ip)
        inm_gdbus_emit_signal(NULL,
                        INM_MANAGER_OBJ,
                        INM_MANAGER_SERVICE,
-                       "ArpingResult",
+                       "ArpRequestResult",
                        g_variant_new("(a{sv})",
                                        builder));
 
@@ -1452,11 +1451,10 @@ static void __init_daemon_introspection()
                        "<method name='GetArpPacketInterval'>"
                                "<arg type='i' name='arp_packet_interval' direction='out'/>"
                                "</method>"
-                       "<method name='StartArping'>"
+                       "<method name='ArpRequestStart'>"
                                "<arg type='s' name='target_ip' direction='in'/>"
-                               "<arg type='i' name='timeout' direction='in'/>"
                                "</method>"
-                       "<method name='StopArping'>"
+                       "<method name='ArpRequestStop'>"
                                "<arg type='s' name='target_ip' direction='in'/>"
                                "</method>"
                        "<method name='StartCheckGateway'>"
@@ -1486,7 +1484,7 @@ static void __init_daemon_introspection()
                        "<signal name='ConnectionsChanged'>"
                        "<arg type='aoao' name='connections'/>"
                        "</signal>"
-                       "<signal name='ArpingResult'>"
+                       "<signal name='ArpRequestResult'>"
                        "<arg type='a{sv}' name='ArpingInfo'/>"
                        "</signal>"
                        "<signal name='CheckGatewayResult'>"

diff --git a/src/inm-manager.c b/src/inm-manager.c
index 763aa001822ce1357ff829cbf78c8e46ef94fff2..37e781300ffbb605b276f4bfa19a2f71ac44849a 100644 (file)
--- a/src/inm-manager.c
+++ b/src/inm-manager.c
@@ -314,7 +314,7 @@ int inm_manager_get_arp_packet_interval(int *interval)
        return 0;
 }
 
-int inm_manager_start_arping(char *target_ip, int timeout)
+int inm_manager_arp_request_start(char *target_ip)
 {
        gchar *ifname;
        int ret = INM_MANAGER_ERROR_NONE;
@@ -327,14 +327,14 @@ int inm_manager_start_arping(char *target_ip, int timeout)
                        !ifname)
                return -1;
 
-       ret = inm_arping_start(ifname, target_ip, timeout, FALSE);
+       ret = inm_arping_start(ifname, target_ip, 0, FALSE);
        if (ret != 0) {
                INM_LOGW("Failed to start arping");
 
                if (ret == INM_ARPING_ERROR_IN_PROGRESS)
                        ret = INM_MANAGER_ERROR_IN_PROGRESS;
                else
-                       ret = -1;
+                       ret = INM_MANAGER_ERROR_OPERATION_FAILED;
        }
 
        g_free(ifname);
@@ -343,7 +343,7 @@ int inm_manager_start_arping(char *target_ip, int timeout)
        return ret;
 }
 
-int inm_manager_stop_arping(char *target_ip)
+int inm_manager_arp_request_stop(char *target_ip)
 {
        gchar *ifname;
        int ret = INM_MANAGER_ERROR_NONE;
@@ -637,7 +637,7 @@ static void __arping_cb(gboolean found,
        if (is_gateway)
                inm_gdbus_emit_gateway_check_result(found, ip);
        else
-               inm_gdbus_emit_arping_result(found, ip);
+               inm_gdbus_emit_arp_request_result(found, ip);
 
        return;
 }