fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-09 08:18:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

wifi: merge branch 'th/wifi-ap-hidden'

Browse source 
https://github.com/NetworkManager/NetworkManager/pull/22
This commit is contained in:
Thomas Haller 2017-06-05 17:32:39 +02:00
commit 14529f5b46
1 changed files with 30 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/devices/wifi/nm-device-wifi.c
View file

@ -791,15 +791,18 @@ complete_connection (NMDevice *device,
NMSettingWireless *s_wifi; NMSettingWireless *s_wifi;
const char *setting_mac; const char *setting_mac;
char *str_ssid = NULL; char *str_ssid = NULL;
NMWifiAP *ap = NULL; NMWifiAP *ap;
const GByteArray *ssid = NULL; const GByteArray *ssid = NULL;
GByteArray *tmp_ssid = NULL; GByteArray *tmp_ssid = NULL;
GBytes *setting_ssid = NULL; GBytes *setting_ssid = NULL;
gboolean hidden = FALSE; gboolean hidden = FALSE;
const char *perm_hw_addr; const char *perm_hw_addr;
const char *mode;
s_wifi = nm_connection_get_setting_wireless (connection); s_wifi = nm_connection_get_setting_wireless (connection);
mode = s_wifi ? nm_setting_wireless_get_mode (s_wifi) : NULL;
if (!specific_object) { if (!specific_object) {
/* If not given a specific object, we need at minimum an SSID */ /* If not given a specific object, we need at minimum an SSID */
if (!s_wifi) { if (!s_wifi) {
@ -819,19 +822,29 @@ complete_connection (NMDevice *device,
return FALSE; return FALSE;
} }
/* Find a compatible AP in the scan list */ if (!nm_streq0 (mode, NM_SETTING_WIRELESS_MODE_AP)) {
ap = find_first_compatible_ap (self, connection, FALSE); /* Find a compatible AP in the scan list */
ap = find_first_compatible_ap (self, connection, FALSE);
/* If we still don't have an AP, then the WiFI settings needs to be /* If we still don't have an AP, then the WiFI settings needs to be
* fully specified by the client. Might not be able to find an AP * fully specified by the client. Might not be able to find an AP
* if the network isn't broadcasting the SSID for example. * if the network isn't broadcasting the SSID for example.
*/ */
if (!ap) { if (!ap) {
if (!nm_setting_verify (NM_SETTING (s_wifi), connection, error))
return FALSE;
hidden = TRUE;
}
} else {
if (!nm_setting_verify (NM_SETTING (s_wifi), connection, error)) if (!nm_setting_verify (NM_SETTING (s_wifi), connection, error))
return FALSE; return FALSE;
ap = NULL;
hidden = TRUE;
} }
} else if (nm_streq0 (mode, NM_SETTING_WIRELESS_MODE_AP)) {
if (!nm_setting_verify (NM_SETTING (s_wifi), connection, error))
return FALSE;
ap = NULL;
} else { } else {
ap = get_ap_by_path (self, specific_object); ap = get_ap_by_path (self, specific_object);
if (!ap) { if (!ap) {
@ -1364,8 +1377,12 @@ hidden_filter_func (NMSettings *settings,
if (!nm_connection_is_type (NM_CONNECTION (connection), NM_SETTING_WIRELESS_SETTING_NAME)) if (!nm_connection_is_type (NM_CONNECTION (connection), NM_SETTING_WIRELESS_SETTING_NAME))
return FALSE; return FALSE;
s_wifi = (NMSettingWireless *) nm_connection_get_setting_wireless (NM_CONNECTION (connection)); s_wifi = nm_connection_get_setting_wireless (NM_CONNECTION (connection));
return s_wifi ? nm_setting_wireless_get_hidden (s_wifi) : FALSE; if (!s_wifi)
return FALSE;
if (nm_streq0 (nm_setting_wireless_get_mode (s_wifi), NM_SETTING_WIRELESS_MODE_AP))
return FALSE;
return nm_setting_wireless_get_hidden (s_wifi);
} }
static GPtrArray * static GPtrArray *
@ -1488,7 +1505,7 @@ request_wireless_scan (NMDeviceWifi *self, gboolean force_if_scanning, GVariant
? nm_utils_ssid_to_utf8 (ssid->data, ssid->len) ? nm_utils_ssid_to_utf8 (ssid->data, ssid->len)
: NULL; : NULL;
_LOGD (LOGD_WIFI, "wifi-scan: (%u) probe scanning SSID %s%s%s", _LOGD (LOGD_WIFI, "wifi-scan: (%u) probe scanning SSID %s%s%s",
i, NM_PRINT_FMT_QUOTED (foo, "\"", foo, "\"", "<hidden>")); i, NM_PRINT_FMT_QUOTED (foo, "\"", foo, "\"", "*any*"));
g_free (foo); g_free (foo);
} }
} else } else