diff options
| author | taesub kim <taesub.kim@samsung.com> | 2017-02-07 02:22:04 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.vlan103.tizen.org> | 2017-02-07 02:22:04 -0800 |
| commit | dab24ad2d7cd118d10099ab0bc6d3c96b14988a5 (patch) | |
| tree | d5f0a043809002cef1b1056c77090cfed745050d | |
| parent | 7671bf6b13869a11ced59f587460752fd4eabe6b (diff) | |
| parent | 63e23c35bd4e12eb311af284c459c4e782fa2a77 (diff) | |
| download | connman-dab24ad2d7cd118d10099ab0bc6d3c96b14988a5.tar.gz connman-dab24ad2d7cd118d10099ab0bc6d3c96b14988a5.tar.bz2 connman-dab24ad2d7cd118d10099ab0bc6d3c96b14988a5.zip | |
Merge "Fix for single channel scan in SelectNetwork" into tizen
| -rwxr-xr-x | gsupplicant/supplicant.c | 22 | ||||
| -rwxr-xr-x | plugins/wifi.c | 3 |
2 files changed, 25 insertions, 0 deletions
diff --git a/gsupplicant/supplicant.c b/gsupplicant/supplicant.c index e9d6b9dc..c596619a 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 76a1d7a0..c9d8c808 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; |