Remove dead code related to 'RequestSpecificScan'. 09/159009/2
authorNiraj Kumar Goit <niraj.g@samsung.com>
Mon, 6 Nov 2017 09:29:24 +0000 (14:59 +0530)
committerNiraj Kumar Goit <niraj.g@samsung.com>
Tue, 7 Nov 2017 04:33:56 +0000 (10:03 +0530)
The Dbus method for Specific AP scan is migrated to
connman module. So, removing dead code related to
'RequestSpecificScan' from net-config.

Change-Id: Iee2efdc1efa1b83c94de8d94d35c153621f6ecda
Signed-off-by: Niraj Kumar Goit <niraj.g@samsung.com>
CMakeLists.txt
include/wifi-ssid-scan.h [deleted file]
interfaces/netconfig-iface-wifi.xml
resources/etc/dbus-1/system.d/net-config.conf
src/signal-handler.c
src/wifi-ssid-scan.c [deleted file]
src/wifi.c

index 87477e0cde4e182a0666f1f4cde33b324ee35b30..8546f90682144c2a5960bebe1c23c48be980eab8 100755 (executable)
@@ -32,7 +32,6 @@ SET(SRCS
        src/wifi-firmware.c
        src/wifi-indicator.c
        src/signal-handler.c
-       src/wifi-ssid-scan.c
        src/utils/emulator.c
        src/wifi-eap-config.c
        src/network-statistics.c
diff --git a/include/wifi-ssid-scan.h b/include/wifi-ssid-scan.h
deleted file mode 100755 (executable)
index 6398bd2..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Network Configuration Module
- *
- * Copyright (c) 2000 - 2012 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#ifndef __NETCONFIG_WIFI_SSID_SCAN_H__
-#define __NETCONFIG_WIFI_SSID_SCAN_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "wifi.h"
-
-gboolean       wifi_ssid_scan(const char *ssid);
-gboolean       wifi_ssid_scan_get_state(void);
-void           wifi_ssid_scan_emit_scan_completed(void);
-void           wifi_ssid_scan_add_bss(GVariant *message);
-
-gboolean       handle_request_specific_scan(Wifi *wifi, GDBusMethodInvocation *context, const gchar *ssid);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __NETCONFIG_WIFI_SSID_SCAN_H__ */
index 23dbabdca14ae6cf2726ae31d1d8ae2741670862..77215392f1d74d752d7837a44b49c397d4a377f3 100755 (executable)
@@ -32,9 +32,6 @@
                <method name="GetAutoscanmode">
                        <arg type="u" name="autoscanmode" direction="out"/>
                </method>
-               <method name="RequestSpecificScan">
-                       <arg type="s" name="SSID" direction="in"/>
-               </method>
                <method name="RequestBssidScan">
                </method>
                <method name="RequestWpsCancel">
index ada7f0f7df11304a810db29255d919acfc058f32..48fbc862d0841396dc9f9f46e6e5ad8f3c1c0443 100755 (executable)
@@ -43,7 +43,6 @@
                <check send_destination="net.netconfig" send_interface="net.netconfig.network_statistics" send_member="ResetWifiTotalTxBytes" privilege="http://tizen.org/privilege/network.set" />
 
                <check send_destination="net.netconfig" send_interface="net.netconfig.wifi" send_member="DeleteEapConfig" privilege="http://tizen.org/privilege/network.profile" />
-               <check send_destination="net.netconfig" send_interface="net.netconfig.wifi" send_member="RequestSpecificScan" privilege="http://tizen.org/privilege/network.set" />
                <check send_destination="net.netconfig" send_interface="net.netconfig.wifi" send_member="RequestBssidScan" privilege="http://tizen.org/privilege/network.set" />
                <check send_destination="net.netconfig" send_interface="net.netconfig.wifi" send_member="RequestWpsCancel" privilege="http://tizen.org/privilege/network.set" />
                <check send_destination="net.netconfig" send_interface="net.netconfig.wifi" send_member="RequestWpsConnect" privilege="http://tizen.org/privilege/network.set" />
index bc6d6583dc6b229733b2b4d9b9c0dd9d5a50b85e..450c08456ec97c8558fb935df89939837b3e1954 100755 (executable)
@@ -36,7 +36,6 @@
 #include "network-state.h"
 #include "cellular-state.h"
 #include "signal-handler.h"
-#include "wifi-ssid-scan.h"
 #include "wifi-background-scan.h"
 #include "wifi-tdls.h"
 
@@ -533,10 +532,7 @@ static void _supplicant_bss_added(GDBusConnection *conn,
                const gchar *sig, GVariant *param, gpointer user_data)
 {
        DBG("BSS added handling!");
-       if (wifi_ssid_scan_get_state() == TRUE)
-               wifi_ssid_scan_add_bss(param);
-       else
-               wifi_state_set_bss_found(TRUE);
+       wifi_state_set_bss_found(TRUE);
 
        return;
 }
@@ -554,12 +550,7 @@ static void _supplicant_scan_done(GDBusConnection *conn,
                        return;
        }
 
-       if (netconfig_wifi_get_bgscan_state() != TRUE) {
-               if (wifi_ssid_scan_get_state() == TRUE)
-                       wifi_ssid_scan_emit_scan_completed();
-               else
-                       wifi_ssid_scan(NULL);
-       } else {
+       if (netconfig_wifi_get_bgscan_state() == TRUE) {
                if (wifi_state_get_technology_state() >=
                                NETCONFIG_WIFI_TECH_POWERED)
                        netconfig_wifi_bgscan_start(FALSE);
diff --git a/src/wifi-ssid-scan.c b/src/wifi-ssid-scan.c
deleted file mode 100755 (executable)
index 620bf6d..0000000
+++ /dev/null
@@ -1,541 +0,0 @@
-/*
- * Network Configuration Module
- *
- * Copyright (c) 2000 - 2012 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <stdio.h>
-
-#include "log.h"
-#include "util.h"
-#include "neterror.h"
-#include "netdbus.h"
-#include "netsupplicant.h"
-#include "wifi-ssid-scan.h"
-#include "wifi-background-scan.h"
-
-#define MAC2STR(a) (a)[0], (a)[1], (a)[2], (a)[3], (a)[4], (a)[5]
-#define MACSTR "%02x:%02x:%02x:%02x:%02x:%02x"
-
-#define WIFI_KEYMGMT_NONE                      (1 << 0)
-#define WIFI_KEYMGMT_IEEE8021X         (1 << 1)
-#define WIFI_KEYMGMT_WPA_NONE          (1 << 2)
-#define WIFI_KEYMGMT_WPA_PSK           (1 << 3)
-#define WIFI_KEYMGMT_WPA_PSK_256       (1 << 4)
-#define WIFI_KEYMGMT_WPA_FT_PSK                (1 << 5)
-#define WIFI_KEYMGMT_WPA_FT_EAP                (1 << 6)
-#define WIFI_KEYMGMT_WPA_EAP           (1 << 7)
-#define WIFI_KEYMGMT_WPA_EAP_256       (1 << 8)
-#define WIFI_KEYMGMT_WPS                       (1 << 9)
-
-#define WIFI_PAIRWISE_NONE                     (1 << 0)
-#define WIFI_PAIRWISE_TKIP                     (1 << 1)
-#define WIFI_PAIRWISE_CCMP                     (1 << 2)
-
-typedef struct {
-       const char *str;
-       unsigned int val;
-} strval_s;
-
-static strval_s wifi_keymgmt[] = {
-       { "none",                       WIFI_KEYMGMT_NONE },
-       { "ieee8021x",          WIFI_KEYMGMT_IEEE8021X },
-       { "wpa-none",           WIFI_KEYMGMT_WPA_NONE },
-       { "wpa-psk",            WIFI_KEYMGMT_WPA_PSK },
-       { "wpa-psk-sha256",     WIFI_KEYMGMT_WPA_PSK_256 },
-       { "wpa-ft-psk",         WIFI_KEYMGMT_WPA_FT_PSK },
-       { "wpa-ft-eap",         WIFI_KEYMGMT_WPA_FT_EAP },
-       { "wpa-eap",            WIFI_KEYMGMT_WPA_EAP },
-       { "wpa-eap-sha256",     WIFI_KEYMGMT_WPA_EAP_256 },
-       { "wps",                        WIFI_KEYMGMT_WPS },
-       { }
-};
-
-static strval_s wifi_pairwise[] = {
-       { "none",                       WIFI_PAIRWISE_NONE },
-       { "tkip",                       WIFI_PAIRWISE_TKIP },
-       { "ccmp",                       WIFI_PAIRWISE_CCMP },
-       { }
-};
-
-typedef enum {
-       WIFI_SECURITY_UNKNOWN = 0x00,
-       WIFI_SECURITY_NONE,
-       WIFI_SECURITY_WEP,
-       WIFI_SECURITY_PSK,
-       WIFI_SECURITY_PSK2,
-       WIFI_SECURITY_IEEE8021X,
-} wifi_security_e;
-
-typedef struct {
-       unsigned char ssid[33];
-       unsigned char bssid[6];
-       wifi_security_e security;
-       unsigned int wpa_keymgmt;
-       unsigned int wpa_pairwise;
-       unsigned int rsn_keymgmt;
-       unsigned int rsn_pairwise;
-       gboolean rsn_selected;
-       gboolean privacy;
-       gboolean wps;
-       int ssid_len;
-} bss_info_t;
-
-static gboolean g_ssid_scan_state = FALSE;
-static GSList *bss_info_list = NULL;
-static guint ssid_scan_timer = 0;
-static char *g_ssid = NULL;
-
-static void __check_keymgmt(const char *str_keymgmt, unsigned int *key_info)
-{
-       int i;
-
-       for (i = 0; wifi_keymgmt[i].str; i++) {
-               if (g_strcmp0(str_keymgmt, wifi_keymgmt[i].str) == 0) {
-                       INFO("keymgmt : %s", str_keymgmt);
-                       *key_info |= wifi_keymgmt[i].val;
-                       break;
-               }
-       }
-}
-
-static void __check_pairwise(const char *str_pairwise, unsigned int *pairwise_info)
-{
-       int i;
-
-       for (i = 0; wifi_pairwise[i].str; i++) {
-               if (g_strcmp0(str_pairwise, wifi_pairwise[i].str) == 0) {
-                       INFO("pairwise : %s", str_pairwise);
-                       *pairwise_info |= wifi_pairwise[i].val;
-                       break;
-               }
-       }
-}
-
-static wifi_security_e __check_security(bss_info_t *bss_info)
-{
-       gboolean ieee8021x = FALSE;
-       gboolean psk = FALSE;
-       gboolean ft_ieee8021x = FALSE;
-       gboolean ft_psk = FALSE;
-       unsigned int keymgmt = bss_info->rsn_keymgmt | bss_info->wpa_keymgmt;
-
-       if (keymgmt & (WIFI_KEYMGMT_WPA_EAP | WIFI_KEYMGMT_WPA_EAP_256))
-               ieee8021x = TRUE;
-       else if (keymgmt & WIFI_KEYMGMT_WPA_FT_EAP)
-               ft_ieee8021x = TRUE;
-
-       if (keymgmt & (WIFI_KEYMGMT_WPA_PSK | WIFI_KEYMGMT_WPA_PSK_256))
-               psk = TRUE;
-       else if (keymgmt & WIFI_KEYMGMT_WPA_FT_PSK)
-               ft_psk = TRUE;
-
-       if (ieee8021x || ft_ieee8021x)
-               bss_info->security = WIFI_SECURITY_IEEE8021X;
-       else if (psk || ft_psk)
-               bss_info->security = WIFI_SECURITY_PSK;
-       else if (bss_info->privacy)
-               bss_info->security = WIFI_SECURITY_WEP;
-       else
-               bss_info->security = WIFI_SECURITY_NONE;
-
-       if (bss_info->rsn_selected) {
-               unsigned int pairwise = bss_info->rsn_pairwise | bss_info->wpa_pairwise;
-               if ((pairwise & WIFI_PAIRWISE_CCMP) ||
-                       (pairwise & (WIFI_PAIRWISE_CCMP | WIFI_PAIRWISE_TKIP)))
-                       bss_info->security = WIFI_SECURITY_PSK2;
-       }
-
-       return bss_info->security;
-}
-
-static gboolean __ssid_scan_timeout(gpointer data)
-{
-       wifi_ssid_scan_emit_scan_completed();
-
-       return FALSE;
-}
-
-static void _start_ssid_scan_timer(void)
-{
-       INFO("Wi-Fi SSID scan started");
-       g_ssid_scan_state = TRUE;
-
-       netconfig_start_timer_seconds(5, __ssid_scan_timeout, NULL, &ssid_scan_timer);
-}
-
-static void _stop_ssid_scan_timer(void)
-{
-       INFO("Wi-Fi SSID scan finished");
-       g_ssid_scan_state = FALSE;
-
-       netconfig_stop_timer(&ssid_scan_timer);
-}
-
-static void _parse_wpa_message(GVariant *param, bss_info_t *bss_info)
-{
-       GVariantIter *iter1;
-       GVariant *var;
-       gchar *key;
-
-       g_variant_get(param, "a{sv}", &iter1);
-       while (g_variant_iter_loop(iter1, "{sv}", &key, &var)) {
-               if (g_strcmp0(key, "KeyMgmt") == 0) {
-                       GVariantIter *iter2;
-                       g_variant_get(var, "as", &iter2);
-                       char *str;
-                       while (g_variant_iter_loop(iter2, "s", &str)) {
-                               if (str == NULL)
-                                       break;
-                               unsigned int key_info = 0;
-                               __check_keymgmt(str, &key_info);
-                               if (bss_info->rsn_selected)
-                                       bss_info->rsn_keymgmt = key_info;
-                               else
-                                       bss_info->wpa_keymgmt = key_info;
-                       }
-                       g_variant_iter_free(iter2);
-               } else if (g_strcmp0(key, "Pairwise") == 0) {
-                       GVariantIter *iter2;
-                       g_variant_get(var, "as", &iter2);
-                       char *str;
-                       while (g_variant_iter_loop(iter2, "s", &str)) {
-                               if (str == NULL)
-                                       break;
-                               unsigned int pairwise_info = 0;
-                               __check_pairwise(str, &pairwise_info);
-                               if (bss_info->rsn_selected)
-                                       bss_info->rsn_pairwise = pairwise_info;
-                               else
-                                       bss_info->wpa_pairwise = pairwise_info;
-                       }
-                       g_variant_iter_free(iter2);
-               }
-       }
-
-       g_variant_iter_free(iter1);
-
-       return;
-}
-
-static gboolean _request_ssid_scan(const char *object_path, const char *ssid)
-{
-       /* TODO: Revise following code */
-
-       GDBusConnection *connection = NULL;
-       GVariant *reply = NULL;
-       GVariant *params = NULL;
-       GError *error = NULL;
-       GVariantBuilder *builder1 = NULL;
-       GVariantBuilder *builder2 = NULL;
-       GVariantBuilder *builder3 = NULL;
-       const gchar *key1 = "Type";
-       const gchar *val1 = "active";
-       const gchar *key2 = "SSIDs";
-       int i = 0;
-
-       connection = netdbus_get_connection();
-       if (connection == NULL) {
-               DBG("Failed to get GDBusconnection");
-               return FALSE;
-       }
-
-       builder1 = g_variant_builder_new(G_VARIANT_TYPE("a{sv}"));
-       g_variant_builder_add(builder1, "{sv}", key1, g_variant_new_string(val1));
-
-       builder2 = g_variant_builder_new(G_VARIANT_TYPE("aay"));
-       builder3 = g_variant_builder_new(G_VARIANT_TYPE("ay"));
-
-       for (i = 0; i < strlen(ssid); i++)
-               g_variant_builder_add(builder3, "y", ssid[i]);
-
-       g_variant_builder_add(builder2, "@ay", g_variant_builder_end(builder3));
-       g_variant_builder_add(builder1, "{sv}", key2, g_variant_builder_end(builder2));
-
-       params = g_variant_new("(@a{sv})", g_variant_builder_end(builder1));
-
-       g_variant_builder_unref(builder1);
-       g_variant_builder_unref(builder2);
-       g_variant_builder_unref(builder3);
-
-       reply = g_dbus_connection_call_sync(
-                       connection,
-                       SUPPLICANT_SERVICE,
-                       object_path,
-                       SUPPLICANT_INTERFACE ".Interface",
-                       "Scan",
-                       params,
-                       NULL,
-                       G_DBUS_CALL_FLAGS_NONE,
-                       NETCONFIG_DBUS_REPLY_TIMEOUT,
-                       netdbus_get_cancellable(),
-                       &error);
-
-       if (reply == NULL) {
-               if (error != NULL) {
-                       ERR("Error!!! dbus_connection_send_with_reply_and_block() failed. "
-                                       "DBus error [%d: %s]", error->code, error->message);
-                       g_error_free(error);
-               } else
-                       ERR("Error!!! Failed to get properties");
-
-               return FALSE;
-       }
-
-       if (g_ssid != NULL)
-               g_free(g_ssid);
-
-       g_ssid = g_strdup(ssid);
-
-       g_variant_unref(reply);
-
-       return TRUE;
-}
-
-static void _emit_ssid_scan_completed(void)
-{
-       GVariantBuilder *builder = NULL;
-       GSList* list = NULL;
-       const char *prop_ssid = "ssid";
-       const char *prop_bssid = "bssid";
-       char bssid_buf[18] = {0,};
-       char *bssid_str = bssid_buf;
-       const char *prop_security = "security";
-       const char *prop_wps = "wps";
-       GVariantBuilder *rawssid_builder = NULL;
-       const char *prop_raw_ssid = "raw_ssid";
-
-       builder = g_variant_builder_new(G_VARIANT_TYPE("a{sv}"));
-       for (list = bss_info_list; list != NULL; list = list->next) {
-               bss_info_t *bss_info = (bss_info_t *)list->data;
-               if (bss_info && g_strcmp0((char *)bss_info->ssid, g_ssid) == 0) {
-                       const gchar *ssid = (char *)bss_info->ssid;
-                       int ssid_len = bss_info->ssid_len;
-                       const gchar *bssid = (gchar *)&bss_info->bssid[0];
-                       int i = 0;
-
-                       wifi_security_e security = __check_security(bss_info);
-                       gboolean wps = bss_info->wps;
-                       DBG("BSS found; SSID:%s security:%d WPS:%d", ssid, security, wps);
-
-                       if (bssid) {
-                               snprintf(bssid_str, sizeof(bssid_buf), MACSTR, MAC2STR(bssid));
-                               DBG("BSSID: %s", bssid_str);
-                       }
-
-                       g_variant_builder_add(builder, "{sv}", prop_ssid, g_variant_new_string(ssid));
-
-                       /* append raw SSID in bytes to the specific
-                          scan completed signal here */
-                       rawssid_builder = g_variant_builder_new(G_VARIANT_TYPE("ay"));
-                       for (i = 0; i < ssid_len; i++)
-                               g_variant_builder_add(rawssid_builder, "y", ssid[i]);
-                       g_variant_builder_add(builder, "{sv}", prop_raw_ssid, g_variant_new("ay", rawssid_builder));
-                       g_variant_builder_unref(rawssid_builder);
-
-                       g_variant_builder_add(builder, "{sv}", prop_bssid,
-                                               g_variant_new_string(bssid));
-                       g_variant_builder_add(builder, "{sv}", prop_security, g_variant_new_int32(security));
-                       /* WPS */
-                       g_variant_builder_add(builder, "{sv}", prop_wps, g_variant_new_boolean(wps));
-               }
-       }
-
-       wifi_emit_specific_scan_completed((Wifi *)get_wifi_object(), g_variant_builder_end(builder));
-
-       if (builder)
-               g_variant_builder_unref(builder);
-
-       if (bss_info_list != NULL) {
-               g_slist_free_full(bss_info_list, g_free);
-               bss_info_list = NULL;
-       }
-
-       if (g_ssid != NULL) {
-               g_free(g_ssid);
-               g_ssid = NULL;
-       }
-
-       INFO("SpecificScanCompleted");
-
-       return;
-}
-
-gboolean wifi_ssid_scan(const char *ssid)
-{
-       const char *if_path;
-       static char *scan_ssid = NULL;
-
-       netconfig_wifi_bgscan_stop();
-
-       if (ssid != NULL) {
-               if (scan_ssid != NULL)
-                       g_free(scan_ssid);
-               scan_ssid = g_strdup(ssid);
-       }
-
-       if (scan_ssid == NULL)
-               goto error;
-
-       if_path = netconfig_wifi_get_supplicant_interface();
-       if (if_path == NULL) {
-               DBG("Fail to get wpa_supplicant DBus path");
-               goto error;
-       }
-
-       if (netconfig_wifi_get_scanning() == TRUE) {
-               DBG("Wi-Fi scan in progress, %s scan will be delayed", scan_ssid);
-               return TRUE;
-       }
-
-       if (bss_info_list) {
-               g_slist_free_full(bss_info_list, g_free);
-               bss_info_list = NULL;
-       }
-
-       INFO("Start Wi-Fi scan with %s(%d)", scan_ssid, strlen(scan_ssid));
-       if (_request_ssid_scan(if_path, (const char *)scan_ssid) == TRUE) {
-               _start_ssid_scan_timer();
-               g_free(scan_ssid);
-               scan_ssid = NULL;
-               return TRUE;
-       }
-
-error:
-       if (scan_ssid != NULL) {
-               g_free(scan_ssid);
-               scan_ssid = NULL;
-       }
-
-       netconfig_wifi_bgscan_start(FALSE);
-
-       return FALSE;
-}
-
-gboolean wifi_ssid_scan_get_state(void)
-{
-       return g_ssid_scan_state;
-}
-
-void wifi_ssid_scan_emit_scan_completed(void)
-{
-       if (g_ssid_scan_state != TRUE)
-               return;
-
-       _stop_ssid_scan_timer();
-       _emit_ssid_scan_completed();
-       netconfig_wifi_bgscan_start(FALSE);
-}
-
-void wifi_ssid_scan_add_bss(GVariant *message)
-{
-       GVariantIter *iter;
-       GVariant *value;
-       gchar *path = NULL;
-       gchar *key;
-       bss_info_t *bss_info;
-
-       if (g_ssid_scan_state != TRUE)
-               return;
-
-       INFO("NEW BSS added");
-
-       if (message == NULL) {
-               DBG("Message does not have parameters");
-               return;
-       }
-
-       if (path != NULL)
-               INFO("Object path of BSS added is %s", path);
-
-       bss_info = g_try_new0(bss_info_t, 1);
-       if (bss_info == NULL)
-               return;
-
-       g_variant_get(message, "(oa{sv})", &path, &iter);
-       while (g_variant_iter_loop(iter, "{sv}", &key, &value)) {
-               if (g_strcmp0(key, "SSID") == 0) {
-                       const guchar *ssid;
-                       gsize ssid_len;
-                       ssid = g_variant_get_fixed_array(value, &ssid_len, sizeof(guchar));
-                       if (ssid != NULL && ssid_len > 0 && ssid_len < 33) {
-                               memcpy(bss_info->ssid, ssid, ssid_len);
-                               bss_info->ssid_len = ssid_len;
-                       } else {
-                               memset(bss_info->ssid, 0, sizeof(bss_info->ssid));
-                               bss_info->ssid_len = 0;
-                       }
-               } else if (g_strcmp0(key, "Privacy") == 0) {
-                       gboolean privacy = FALSE;
-                       privacy = g_variant_get_boolean(value);
-                       bss_info->privacy = privacy;
-               } else if (g_strcmp0(key, "RSN") == 0) {
-                       bss_info->rsn_selected = TRUE;
-                       _parse_wpa_message(value, bss_info);
-               } else if (g_strcmp0(key, "WPA") == 0) {
-                       bss_info->rsn_selected = FALSE;
-                       _parse_wpa_message(value, bss_info);
-               } else if (g_strcmp0(key, "IEs") == 0) {
-                       const guchar *ie;
-                       gsize ie_len;
-                       ie = g_variant_get_fixed_array(value, &ie_len, sizeof(guchar));
-                       DBG("The IE : %s", ie);
-               } else if (g_strcmp0(key, "BSSID") == 0) {
-                       const guchar *bssid;
-                       gsize bssid_len;
-
-                       bssid = g_variant_get_fixed_array(value, &bssid_len, sizeof(guchar));
-                       if (bssid != NULL && bssid_len == 6)
-                               memcpy(bss_info->bssid, bssid, bssid_len);
-               }
-       }
-
-       g_variant_iter_free(iter);
-       if (path)
-               g_free(path);
-
-       if (bss_info->ssid[0] == '\0') {
-               g_free(bss_info);
-               return;
-       }
-
-       if (bss_info->security == WIFI_SECURITY_UNKNOWN) {
-               if (bss_info->privacy == TRUE)
-                       bss_info->security = WIFI_SECURITY_WEP;
-               else
-                       bss_info->security = WIFI_SECURITY_NONE;
-       }
-
-       bss_info_list = g_slist_append(bss_info_list, bss_info);
-}
-
-gboolean handle_request_specific_scan(Wifi *wifi,
-               GDBusMethodInvocation *context, const gchar *ssid)
-{
-       gboolean result = FALSE;
-
-       g_return_val_if_fail(wifi != NULL, FALSE);
-       g_return_val_if_fail(ssid != NULL, FALSE);
-
-       result = wifi_ssid_scan((const char *)ssid);
-
-       if (result != TRUE)
-               netconfig_error_dbus_method_return(context, NETCONFIG_ERROR_INTERNAL, "FailSpecificScan");
-       else
-               wifi_complete_request_specific_scan(wifi, context);
-
-       return result;
-}
index 92376b0bd255440376a971ee556c32e224b88c23..a27a83ed6caa2cacc17ef78f76e9c3a4490cff30 100755 (executable)
@@ -35,7 +35,6 @@
 #include "wifi-state.h"
 #include "wifi-agent.h"
 #include "wifi-firmware.h"
-#include "wifi-ssid-scan.h"
 #include "wifi-passpoint.h"
 #include "wifi-eap-config.h"
 #include "wifi-background-scan.h"
@@ -162,8 +161,6 @@ void wifi_object_create_and_init(void)
                        G_CALLBACK(handle_get_wifi_state), NULL);
 
        /* WIFI scan */
-       g_signal_connect(wifi_object, "handle-request-specific-scan",
-                       G_CALLBACK(handle_request_specific_scan), NULL);
        g_signal_connect(wifi_object, "handle-request-bssid-scan",
                        G_CALLBACK(handle_request_bssid_scan), NULL);
        g_signal_connect(wifi_object, "handle-get-bssid-list",