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

settings,libnm: move is-adhoc-wpa check to libnm

Browse source 
"nm-settings.c" is complex enough. Move this trivial helper function to libnm-core.
This commit is contained in:
Thomas Haller 2019-05-26 23:39:25 +02:00
parent 25de86abb6
commit ceaf64eee7
3 changed files with 31 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libnm-core/nm-core-internal.h
View file

@ -815,4 +815,6 @@ void _nm_bridge_vlan_str_append_rest (const NMBridgeVlan *vlan,
GString *string, GString *string,
gboolean leading_space); gboolean leading_space);
gboolean nm_utils_connection_is_adhoc_wpa (NMConnection *connection);
#endif #endif

27
libnm-core/nm-utils.c
View file

@ -6049,3 +6049,30 @@ _nm_utils_bridge_vlan_verify_list (GPtrArray *vlans,
return TRUE; return TRUE;
} }
gboolean
nm_utils_connection_is_adhoc_wpa (NMConnection *connection)
{
NMSettingWireless *s_wifi;
NMSettingWirelessSecurity *s_wsec;
const char *key_mgmt;
const char *mode;
s_wifi = nm_connection_get_setting_wireless (connection);
if (!s_wifi)
return FALSE;
mode = nm_setting_wireless_get_mode (s_wifi);
if (!nm_streq0 (mode, NM_SETTING_WIRELESS_MODE_ADHOC))
return FALSE;
s_wsec = nm_connection_get_setting_wireless_security (connection);
if (!s_wsec)
return FALSE;
key_mgmt = nm_setting_wireless_security_get_key_mgmt (s_wsec);
if (!nm_streq0 (key_mgmt, "wpa-none"))
return FALSE;
return TRUE;
}

36
src/settings/nm-settings.c
View file

@ -711,38 +711,6 @@ pk_add_cb (NMAuthChain *chain,
send_agent_owned_secrets (self, added, subject); send_agent_owned_secrets (self, added, subject);
} }
/* FIXME: remove if/when kernel supports adhoc wpa */
static gboolean
is_adhoc_wpa (NMConnection *connection)
{
NMSettingWireless *s_wifi;
NMSettingWirelessSecurity *s_wsec;
const char *mode, *key_mgmt;
/* The kernel doesn't support Ad-Hoc WPA connections well at this time,
* and turns them into open networks. It's been this way since at least
* 2.6.30 or so; until that's fixed, disable WPA-protected Ad-Hoc networks.
*/
s_wifi = nm_connection_get_setting_wireless (connection);
if (!s_wifi)
return FALSE;
mode = nm_setting_wireless_get_mode (s_wifi);
if (g_strcmp0 (mode, NM_SETTING_WIRELESS_MODE_ADHOC) != 0)
return FALSE;
s_wsec = nm_connection_get_setting_wireless_security (connection);
if (!s_wsec)
return FALSE;
key_mgmt = nm_setting_wireless_security_get_key_mgmt (s_wsec);
if (g_strcmp0 (key_mgmt, "wpa-none") != 0)
return FALSE;
return TRUE;
}
void void
nm_settings_add_connection_dbus (NMSettings *self, nm_settings_add_connection_dbus (NMSettings *self,
NMConnection *connection, NMConnection *connection,
@ -772,11 +740,11 @@ nm_settings_add_connection_dbus (NMSettings *self,
goto done; goto done;
} }
/* The kernel doesn't support Ad-Hoc WPA connections well at this time, /* FIXME: The kernel doesn't support Ad-Hoc WPA connections well at this time,
* and turns them into open networks. It's been this way since at least * and turns them into open networks. It's been this way since at least
* 2.6.30 or so; until that's fixed, disable WPA-protected Ad-Hoc networks. * 2.6.30 or so; until that's fixed, disable WPA-protected Ad-Hoc networks.
*/ */
if (is_adhoc_wpa (connection)) { if (nm_utils_connection_is_adhoc_wpa (connection)) {
error = g_error_new_literal (NM_SETTINGS_ERROR, error = g_error_new_literal (NM_SETTINGS_ERROR,
NM_SETTINGS_ERROR_INVALID_CONNECTION, NM_SETTINGS_ERROR_INVALID_CONNECTION,
"WPA Ad-Hoc disabled due to kernel bugs"); "WPA Ad-Hoc disabled due to kernel bugs");