Merge "Added cap_dac_override capability" into tizen_4.0

[platform/core/connectivity/net-config.git] / src / signal-handler.c

diff --git a/src/signal-handler.c b/src/signal-handler.c
index 385bd98..bc6d658 100755 (executable)
--- a/src/signal-handler.c
+++ b/src/signal-handler.c
@@ -28,6 +28,7 @@
 #include "netdbus.h"
 #include "neterror.h"
 #include "wifi-wps.h"
+#include "wifi-bssid-scan.h"
 #include "wifi-agent.h"
 #include "wifi-power.h"
 #include "wifi-state.h"
@@ -107,7 +108,7 @@ static void __netconfig_extract_ipv4_signal_data(GVariant *dictionary, const gch
        g_variant_iter_init(&iter, dictionary);
        while (g_variant_iter_loop(&iter, "{sv}", &key, &var)) {
                if (g_strcmp0(key, "Address") == 0)  {
-                       value = g_variant_get_string(var, NULL);
+                       g_variant_get(var, "&s", &value);
                        char *old_ip = vconf_get_str(VCONFKEY_NETWORK_IP);
 
                        DBG("Old IPv4.Address [%s] Received new IPv4.Address [%s]", old_ip, value);
@@ -132,7 +133,7 @@ static void __netconfig_extract_ipv6_signal_data(GVariant *dictionary, const gch
        g_variant_iter_init(&iter, dictionary);
        while (g_variant_iter_loop(&iter, "{sv}", &key, &var)) {
                if (g_strcmp0(key, "Address") == 0)  {
-                       value = g_variant_get_string(var, NULL);
+                       g_variant_get(var, "&s", &value);
                        char *old_ip6 = vconf_get_str(VCONFKEY_NETWORK_IP6);
 
                        DBG("Old IPv6.Address [%s] Received new IPv6.Address [%s]", old_ip6, value);
@@ -487,8 +488,8 @@ static void _supplicant_interface_removed(GDBusConnection *conn,
                const gchar *sig, GVariant *param, gpointer user_data)
 {
        DBG("Interface removed handling!");
-       if (netconfig_wifi_is_wps_enabled() == TRUE)
-               netconfig_wifi_wps_signal_scanaborted();
+       if (netconfig_wifi_is_bssid_scan_started() == TRUE)
+               netconfig_wifi_bssid_signal_scanaborted();
 
        return;
 }
@@ -510,8 +511,11 @@ static void _supplicant_properties_changed(GDBusConnection *conn,
        while (g_variant_iter_loop(iter, "{sv}", &key, &variant)) {
                if (g_strcmp0(key, "Scanning") == 0) {
                        scanning = g_variant_get_boolean(variant);
+                       DBG("setting scanning %s", scanning ? "TRUE" : "FALSE");
                        if (scanning == TRUE)
                                netconfig_wifi_set_scanning(TRUE);
+                       else
+                               netconfig_wifi_set_scanning(FALSE);
 
                        g_variant_unref(variant);
                        g_free(key);
@@ -544,8 +548,8 @@ static void _supplicant_scan_done(GDBusConnection *conn,
        DBG("Scan Done handling!");
        netconfig_wifi_set_scanning(FALSE);
 
-       if (netconfig_wifi_is_wps_enabled() == TRUE) {
-               netconfig_wifi_wps_signal_scandone();
+       if (netconfig_wifi_is_bssid_scan_started() == TRUE) {
+               netconfig_wifi_bssid_signal_scandone();
                if (wifi_state_get_technology_state() < NETCONFIG_WIFI_TECH_POWERED)
                        return;
        }
@@ -692,7 +696,7 @@ static void _supplicant_wifi_wps_event(GVariant *param)
 
        g_variant_get(param, "(sa{sv})", &name, &iter);
        INFO("Event Result: %s", name);
-       if (g_strcmp0(name, "failed") == 0) {
+       if (g_strcmp0(name, "fail") == 0) {
                while (g_variant_iter_loop(iter, "{sv}", &key, &variant)) {
                        if (key == NULL)
                                goto error;