Use ScanDone signal from connman instead of wpa_supplicant.

Change-Id: I73b9a50862c5a7d9f4366872850bf3d531e7cfa3
Signed-off-by: Niraj Kumar Goit <niraj.g@samsung.com>

diff --git a/src/network_signal.c b/src/network_signal.c
index c98df330acfe7e1a4989c8945c3f45184c953125..32a45777ed72c452b580c19f7c0b463c8de41383 100755 (executable)
--- a/src/network_signal.c
+++ b/src/network_signal.c
@@ -26,7 +26,7 @@ static __thread net_state_type_e service_state_table = NET_STATE_TYPE_UNKNOWN;
 static __thread int net_service_error = NET_ERR_NONE;
 static __thread guint gdbus_conn_subscribe_id_connman_state = 0;
 static __thread guint gdbus_conn_subscribe_id_connman_error = 0;
-static __thread guint gdbus_conn_subscribe_id_supplicant = 0;
+static __thread guint gdbus_conn_subscribe_id_connman_scandone = 0;
 static __thread guint gdbus_conn_subscribe_id_netconfig_wifi = 0;
 static __thread guint gdbus_conn_subscribe_id_netconfig = 0;
 static __thread int net_dpm_wifi_state = -1;
@@ -850,7 +850,7 @@ static int __net_handle_wifi_connect_fail_event(GVariant *param)
        return NET_ERR_NONE;
 }
 
-static void __net_supplicant_signal_filter(GDBusConnection *conn,
+static void __net_connman_manager_signal_filter(GDBusConnection *conn,
                const gchar *name, const gchar *path, const gchar *interface,
                const gchar *sig, GVariant *param, gpointer user_data)
 {
@@ -1000,7 +1000,7 @@ int _net_deregister_signal(void)
        g_dbus_connection_signal_unsubscribe(connection,
                                                gdbus_conn_subscribe_id_connman_error);
        g_dbus_connection_signal_unsubscribe(connection,
-                                               gdbus_conn_subscribe_id_supplicant);
+                                               gdbus_conn_subscribe_id_connman_scandone);
        g_dbus_connection_signal_unsubscribe(connection,
                                                gdbus_conn_subscribe_id_netconfig_wifi);
        g_dbus_connection_signal_unsubscribe(connection,
@@ -1074,16 +1074,16 @@ int _net_register_signal(void)
                        NULL,
                        NULL);
 
-       /* Create supplicant service connection */
-       gdbus_conn_subscribe_id_supplicant = g_dbus_connection_signal_subscribe(
+       /* Create connman service scandone connection */
+       gdbus_conn_subscribe_id_connman_scandone = g_dbus_connection_signal_subscribe(
                        connection,
-                       SUPPLICANT_SERVICE,
-                       SUPPLICANT_IFACE_INTERFACE,
+                       CONNMAN_SERVICE,
+                       CONNMAN_MANAGER_INTERFACE,
                        "ScanDone",
-                       NULL,
+                       CONNMAN_MANAGER_PATH,
                        NULL,
                        G_DBUS_SIGNAL_FLAGS_NONE,
-                       __net_supplicant_signal_filter,
+                       __net_connman_manager_signal_filter,
                        NULL,
                        NULL);
 
@@ -1103,7 +1103,7 @@ int _net_register_signal(void)
        if (gdbus_conn_subscribe_id_connman_state == 0 ||
                gdbus_conn_subscribe_id_connman_error == 0 ||
                gdbus_conn_subscribe_id_netconfig == 0 ||
-               gdbus_conn_subscribe_id_supplicant == 0 ||
+               gdbus_conn_subscribe_id_connman_scandone == 0 ||
                gdbus_conn_subscribe_id_netconfig_wifi == 0) {
                WIFI_LOG(WIFI_ERROR, "Failed register signals " //LCOV_EXCL_LINE
                                "connman_state(%d), connman_error(%d), netconfig(%d), "
@@ -1111,7 +1111,7 @@ int _net_register_signal(void)
                                gdbus_conn_subscribe_id_connman_state,
                                gdbus_conn_subscribe_id_connman_error,
                                gdbus_conn_subscribe_id_netconfig,
-                               gdbus_conn_subscribe_id_supplicant,
+                               gdbus_conn_subscribe_id_connman_scandone,
                                gdbus_conn_subscribe_id_netconfig_wifi);
                Error = NET_ERR_NOT_SUPPORTED; //LCOV_EXCL_LINE
        }