fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-10 08:10:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

iwd: Rename NM_IWD_NETWORK_SECURITY_NONE to _OPEN

Browse source 
IWD doesn't expose on D-Bus, or in the network profile files, the
information on whether a network has no security or uses OWE so they
should be the same thing to the iwd backend (similarly WPA2-Personal and
WPA3-Personal/SAE).  But OWE implies some security against some attacks
so the NONE naming could be misleading.
This commit is contained in:
Andrew Zaborowski 2020-11-19 03:28:12 +01:00 • committed by Thomas Haller
parent ba7a13789f
commit 4aea512b15
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -789,7 +789,7 @@ check_connection_compatible(NMDevice *device, NMConnection *connection, GError *
return FALSE;
}
} else if (!NM_IN_SET(security,
NM_IWD_NETWORK_SECURITY_NONE,
NM_IWD_NETWORK_SECURITY_OPEN,
NM_IWD_NETWORK_SECURITY_PSK)) {
nm_utils_error_set_literal(error,
NM_UTILS_ERROR_CONNECTION_AVAILABLE_INCOMPATIBLE,
@ -819,7 +819,7 @@ check_connection_compatible(NMDevice *device, NMConnection *connection, GError *
return FALSE;
}
if (!NM_IN_SET(security, NM_IWD_NETWORK_SECURITY_NONE, NM_IWD_NETWORK_SECURITY_PSK)) {
if (!NM_IN_SET(security, NM_IWD_NETWORK_SECURITY_OPEN, NM_IWD_NETWORK_SECURITY_PSK)) {
nm_utils_error_set_literal(
error,
NM_UTILS_ERROR_CONNECTION_AVAILABLE_INCOMPATIBLE,
@ -1740,7 +1740,7 @@ act_check_interface(NMDeviceIwd *self)
&security))
goto failed;
if (security == NM_IWD_NETWORK_SECURITY_NONE) {
if (security == NM_IWD_NETWORK_SECURITY_OPEN) {
g_dbus_proxy_call(proxy,
"StartOpen",
g_variant_new("(s)", ssid),

10
src/core/devices/wifi/nm-iwd-manager.c
View file

@ -533,7 +533,7 @@ mirror_connection(NMIwdManager * self,
switch (id->security) {
case NM_IWD_NETWORK_SECURITY_WEP:
case NM_IWD_NETWORK_SECURITY_NONE:
case NM_IWD_NETWORK_SECURITY_OPEN:
case NM_IWD_NETWORK_SECURITY_PSK:
break;
case NM_IWD_NETWORK_SECURITY_8021X:
@ -642,7 +642,7 @@ mirror_connection(NMIwdManager * self,
case NM_IWD_NETWORK_SECURITY_WEP:
key_mgmt = "none";
break;
case NM_IWD_NETWORK_SECURITY_NONE:
case NM_IWD_NETWORK_SECURITY_OPEN:
key_mgmt = NULL;
break;
case NM_IWD_NETWORK_SECURITY_PSK:
@ -758,7 +758,7 @@ interface_added(GDBusObjectManager *object_manager,
return;
if (nm_streq(type_str, "open"))
security = NM_IWD_NETWORK_SECURITY_NONE;
security = NM_IWD_NETWORK_SECURITY_OPEN;
else if (nm_streq(type_str, "psk"))
security = NM_IWD_NETWORK_SECURITY_PSK;
else if (nm_streq(type_str, "8021x"))
@ -840,7 +840,7 @@ interface_removed(GDBusObjectManager *object_manager,
return;
if (nm_streq(type_str, "open"))
id.security = NM_IWD_NETWORK_SECURITY_NONE;
id.security = NM_IWD_NETWORK_SECURITY_OPEN;
else if (nm_streq(type_str, "psk"))
id.security = NM_IWD_NETWORK_SECURITY_PSK;
else if (nm_streq(type_str, "8021x"))
@ -1242,7 +1242,7 @@ nm_iwd_manager_get_ap_mirror_connection(NMIwdManager *self, NMWifiAP *ap)
NMIwdManagerPrivate * priv = NM_IWD_MANAGER_GET_PRIVATE(self);
KnownNetworkData * data;
char name_buf[33];
KnownNetworkId kn_id = {name_buf, NM_IWD_NETWORK_SECURITY_NONE};
KnownNetworkId kn_id = {name_buf, NM_IWD_NETWORK_SECURITY_OPEN};
const guint8 * ssid_bytes;
gsize ssid_len;
NM80211ApFlags flags = nm_wifi_ap_get_flags(ap);

2
src/core/devices/wifi/nm-wifi-utils.c
View file

@ -923,7 +923,7 @@ nm_wifi_connection_get_iwd_ssid_and_security(NMConnection * connection,
s_wireless_sec = nm_connection_get_setting_wireless_security(connection);
if (!s_wireless_sec) {
NM_SET_OUT(security, NM_IWD_NETWORK_SECURITY_NONE);
NM_SET_OUT(security, NM_IWD_NETWORK_SECURITY_OPEN);
return TRUE;
}

2
src/core/devices/wifi/nm-wifi-utils.h
View file

@ -13,7 +13,7 @@
#include "nm-setting-8021x.h"
typedef enum {
NM_IWD_NETWORK_SECURITY_NONE,
NM_IWD_NETWORK_SECURITY_OPEN,
NM_IWD_NETWORK_SECURITY_WEP,
NM_IWD_NETWORK_SECURITY_PSK,
NM_IWD_NETWORK_SECURITY_8021X,