From 63e23c35bd4e12eb311af284c459c4e782fa2a77 Mon Sep 17 00:00:00 2001 From: taesub kim Date: Thu, 12 Jan 2017 14:02:44 +0900 Subject: [PATCH] Fix for single channel scan in SelectNetwork Change-Id: I165fd22bab5ced4a383b0034da79a87712110636 Signed-off-by: Taesub Kim --- gsupplicant/supplicant.c | 22 ++++++++++++++++++++++ plugins/wifi.c | 3 +++ 2 files changed, 25 insertions(+) diff --git a/gsupplicant/supplicant.c b/gsupplicant/supplicant.c index e9d6b9d..c596619 100755 --- a/gsupplicant/supplicant.c +++ b/gsupplicant/supplicant.c @@ -4385,7 +4385,11 @@ static void interface_select_network_result(const char *error, err = 0; if (error) { +#if defined TIZEN_EXT + SUPPLICANT_DBG("SelectNetwork errorFreq %s", error); +#else SUPPLICANT_DBG("SelectNetwork error %s", error); +#endif err = parse_supplicant_error(iter); } @@ -4403,9 +4407,15 @@ static void interface_select_network_params(DBusMessageIter *iter, { struct interface_connect_data *data = user_data; GSupplicantInterface *interface = data->interface; +#if defined TIZEN_EXT + GSupplicantSSID *ssid = data->ssid; +#endif dbus_message_iter_append_basic(iter, DBUS_TYPE_OBJECT_PATH, &interface->network_path); +#if defined TIZEN_EXT + dbus_message_iter_append_basic(iter, DBUS_TYPE_INT32, &ssid->freq); +#endif } static void interface_add_network_result(const char *error, @@ -4428,11 +4438,23 @@ static void interface_add_network_result(const char *error, g_free(interface->network_path); interface->network_path = g_strdup(path); +#if defined TIZEN_EXT + SUPPLICANT_DBG(".Interface.SelectNetworkFreq"); +#endif + +#if defined TIZEN_EXT + supplicant_dbus_method_call(data->interface->path, + SUPPLICANT_INTERFACE ".Interface", "SelectNetworkFreq", + interface_select_network_params, + interface_select_network_result, data, + interface); +#else supplicant_dbus_method_call(data->interface->path, SUPPLICANT_INTERFACE ".Interface", "SelectNetwork", interface_select_network_params, interface_select_network_result, data, interface); +#endif return; diff --git a/plugins/wifi.c b/plugins/wifi.c index 76a1d7a..c9d8c80 100755 --- a/plugins/wifi.c +++ b/plugins/wifi.c @@ -2168,6 +2168,9 @@ static void ssid_init(GSupplicantSSID *ssid, struct connman_network *network) #if defined TIZEN_EXT ssid->bssid = connman_network_get_bssid(network); #endif +#if defined TIZEN_EXT + ssid->freq = connman_network_get_frequency(network); +#endif if (connman_setting_get_bool("BackgroundScanning")) ssid->bgscan = BGSCAN_DEFAULT; -- 2.7.4