fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-30 06:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

iwd: support connecting to hidden networks

Browse source 
Newer versions of iwd has supported connecting to hidden networks for a
while now. There's a separate "connect-hidden" command in iwctl that
needs to be used instead of the regular "connect" command.
The equivalent on dbus is to use ConnectHiddenNetwork instead of
Connect on the Station interface. NetworkManager however uses the
Network interface and given we the explicit SSID usage we can connect
to hidden networks with that.

This change disabled the explicit check that disallows even attempting
hidden networks when using iwd.

This has been tested to work with a previously known hidden network.
Tests connecting to a previously unknown network has failed.

(cherry picked from commit cd095f49dc)
This commit is contained in:
Andreas Henriksson 2019-09-23 16:02:32 +02:00 • committed by Thomas Haller
parent da757f80cc
commit dc115bf406
1 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/devices/wifi/nm-device-iwd.c
View file

@ -615,13 +615,6 @@ check_connection_compatible (NMDevice *device, NMConnection *connection, GError
return FALSE;
}
/* Hidden SSIDs not supported in any mode (client or AP) */
if (nm_setting_wireless_get_hidden (s_wireless)) {
nm_utils_error_set_literal (error, NM_UTILS_ERROR_CONNECTION_AVAILABLE_TEMPORARY,
"hidden networks not supported by the IWD backend");
return FALSE;
}
security = nm_wifi_connection_get_iwd_security (connection, &mapped);
if (!mapped) {
nm_utils_error_set_literal (error, NM_UTILS_ERROR_CONNECTION_AVAILABLE_TEMPORARY,
@ -630,6 +623,15 @@ check_connection_compatible (NMDevice *device, NMConnection *connection, GError
}
mode = nm_setting_wireless_get_mode (s_wireless);
/* Hidden SSIDs only supported in client mode */
if ( nm_setting_wireless_get_hidden (s_wireless)
&& !NM_IN_STRSET (mode, NULL, NM_SETTING_WIRELESS_MODE_INFRA)) {
nm_utils_error_set_literal (error, NM_UTILS_ERROR_CONNECTION_AVAILABLE_TEMPORARY,
"non-infrastructure hidden networks not supported by the IWD backend");
return FALSE;
}
if (NM_IN_STRSET (mode, NULL, NM_SETTING_WIRELESS_MODE_INFRA)) {
/* 8021x networks can only be used if they've been provisioned on the IWD side and
* thus are Known Networks.
@ -757,6 +759,7 @@ complete_connection (NMDevice *device,
NMWifiAP *ap;
GBytes *ssid;
GBytes *setting_ssid = NULL;
gboolean hidden = FALSE;
const char *mode;
s_wifi = nm_connection_get_setting_wireless (connection);
@ -789,16 +792,14 @@ complete_connection (NMDevice *device,
/* Find a compatible AP in the scan list */
ap = nm_wifi_aps_find_first_compatible (&priv->aps_lst_head, connection);
if (!ap) {
if (!nm_streq0 (mode, NM_SETTING_WIRELESS_MODE_ADHOC)) {
g_set_error_literal (error,
NM_DEVICE_ERROR,
NM_DEVICE_ERROR_INVALID_CONNECTION,
"No compatible AP in the scan list and hidden SSIDs not supported.");
return FALSE;
}
/* 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
* if the network isn't broadcasting the SSID for example.
*/
if (!nm_setting_verify (NM_SETTING (s_wifi), connection, error))
return FALSE;
hidden = TRUE;
}
} else {
ap = nm_wifi_ap_lookup_for_device (NM_DEVICE (self), specific_object);
@ -849,6 +850,9 @@ complete_connection (NMDevice *device,
nm_setting_wireless_get_mac_address (s_wifi) ? NULL : nm_device_get_iface (device),
TRUE);
if (hidden)
g_object_set (s_wifi, NM_SETTING_WIRELESS_HIDDEN, TRUE, NULL);
return TRUE;
}