Create temporary file to check wifi firmware state

[platform/core/connectivity/net-config.git] / src / ip-conflict-detect.c

diff --git a/src/ip-conflict-detect.c b/src/ip-conflict-detect.c
index a12c3ed..0490866 100755 (executable)
--- a/src/ip-conflict-detect.c
+++ b/src/ip-conflict-detect.c
@@ -94,7 +94,7 @@ static struct timer_data td = {
 
 int ioctl_sock;
 static bool initial_bursts = true;
-bool is_ip_conflict_detect_enabled = true;
+bool is_ip_conflict_detect_enabled = false;
 static gboolean send_arp(gpointer data);
 static void __netconfig_wifi_notify_ip_conflict(char *state, char *mac);
 ip_conflict_state_e conflict_state = NETCONFIG_IP_CONFLICT_STATE_CONFLICT_NOT_DETECTED;
@@ -127,8 +127,6 @@ static gboolean __arp_reply_timeout_cb(gpointer data)
 
        sd->iteration++;
        sd->arp_reply_timer = -1;
-       if (sd->timer_id != -1)
-               g_source_remove(sd->timer_id);
 
        if (conflict_state != NETCONFIG_IP_CONFLICT_STATE_CONFLICT_NOT_DETECTED &&
                        sd->iteration == CONFLICT_REMOVE_ITERATION_LIMIT) {
@@ -337,8 +335,8 @@ err:
 
 struct sock_data * start_ip_conflict_mon(void)
 {
-       if (is_ip_conflict_detect_enabled == false) {
-               INFO("detection mode is set to false");
+       if (is_ip_conflict_detect_enabled == true) {
+               INFO("detection mode is set to true");
                return NULL;
        }
 
@@ -383,6 +381,8 @@ struct sock_data * start_ip_conflict_mon(void)
 
                sd->timeout = td.initial_time;
                send_arp(sd);
+               is_ip_conflict_detect_enabled = true;
+               conflict_state = NETCONFIG_IP_CONFLICT_STATE_CONFLICT_NOT_DETECTED;
                return sd;
        }
 }
@@ -414,6 +414,8 @@ void stop_ip_conflict_mon()
        }
        g_free(sd);
        sd = NULL;
+       is_ip_conflict_detect_enabled = false;
+       conflict_state = NETCONFIG_IP_CONFLICT_STATE_UNKNOWN;
        INFO("Monitoring stopped");
 }
 
@@ -440,34 +442,30 @@ static void __netconfig_wifi_notify_ip_conflict(char *state, char *mac)
 gboolean handle_ip_conflict_set_enable(Wifi *wifi, GDBusMethodInvocation *context,
                                       bool detect)
 {
-       g_return_val_if_fail(wifi != NULL, FALSE);
+       g_return_val_if_fail(wifi != NULL, TRUE);
 
 
        if (detect == false) {
-               is_ip_conflict_detect_enabled = false;
-               conflict_state = NETCONFIG_IP_CONFLICT_STATE_UNKNOWN;
                if (sd != NULL)
                        stop_ip_conflict_mon();
                else {
                        netconfig_error_dbus_method_return(context, NETCONFIG_ERROR_INTERNAL, "AlreadyExists");
                        wifi_complete_ip_conflict_set_enable(wifi, context);
-                       return FALSE;
+                       return TRUE;
                }
        } else {
-               is_ip_conflict_detect_enabled = true;
-               conflict_state = NETCONFIG_IP_CONFLICT_STATE_CONFLICT_NOT_DETECTED;
                if (sd == NULL) {
                        if (start_ip_conflict_mon() == NULL) {
                                INFO("Failed to start IP conflict monitoring");
                                netconfig_error_dbus_method_return(context,
                                                NETCONFIG_ERROR_INTERNAL, "Failed");
                                wifi_complete_ip_conflict_set_enable(wifi, context);
-                               return FALSE;
+                               return TRUE;
                        }
                } else {
                        netconfig_error_dbus_method_return(context, NETCONFIG_ERROR_INTERNAL, "AlreadyExists");
                        wifi_complete_ip_conflict_set_enable(wifi, context);
-                       return FALSE;
+                       return TRUE;
                }
        }
 
@@ -477,7 +475,7 @@ gboolean handle_ip_conflict_set_enable(Wifi *wifi, GDBusMethodInvocation *contex
 
 gboolean handle_is_ip_conflict_detect_enabled(Wifi *wifi, GDBusMethodInvocation *context)
 {
-       g_return_val_if_fail(wifi != NULL, FALSE);
+       g_return_val_if_fail(wifi != NULL, TRUE);
        GVariant *param = NULL;
        param = g_variant_new("(b)", is_ip_conflict_detect_enabled);
        g_dbus_method_invocation_return_value(context, param);
@@ -486,9 +484,13 @@ gboolean handle_is_ip_conflict_detect_enabled(Wifi *wifi, GDBusMethodInvocation
 
 gboolean handle_set_ip_conflict_period(Wifi *wifi, GDBusMethodInvocation *context, guint initial_time)
 {
-       g_return_val_if_fail(wifi != NULL, FALSE);
-       if (initial_time < MAX_ARP_SEND_TIME && initial_time > MIN_ARP_SEND_TIME)
-               return FALSE;
+       g_return_val_if_fail(wifi != NULL, TRUE);
+       INFO("%d", initial_time);
+       if (initial_time > MAX_ARP_SEND_TIME || initial_time < MIN_ARP_SEND_TIME) {
+               netconfig_error_dbus_method_return(context,
+                                               NETCONFIG_ERROR_INTERNAL, "Failed");
+               return TRUE;
+       }
 
        td.initial_time = 1000 * initial_time;
        // remove timer
@@ -500,7 +502,7 @@ gboolean handle_set_ip_conflict_period(Wifi *wifi, GDBusMethodInvocation *contex
 
 gboolean handle_get_ip_conflict_state(Wifi *wifi, GDBusMethodInvocation *context)
 {
-       g_return_val_if_fail(wifi != NULL, FALSE);
+       g_return_val_if_fail(wifi != NULL, TRUE);
        GVariant *param = NULL;
        param = g_variant_new("(u)", conflict_state);
        g_dbus_method_invocation_return_value(context, param);
@@ -509,7 +511,7 @@ gboolean handle_get_ip_conflict_state(Wifi *wifi, GDBusMethodInvocation *context
 
 gboolean handle_get_ip_conflict_period(Wifi *wifi, GDBusMethodInvocation *context)
 {
-       g_return_val_if_fail(wifi != NULL, FALSE);
+       g_return_val_if_fail(wifi != NULL, TRUE);
        GVariant *param = NULL;
        param = g_variant_new("(u)", td.initial_time/1000);
        g_dbus_method_invocation_return_value(context, param);