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

wifi: make MAC address randomization during scanning configurable

Browse source 
This allows the user to disable MAC address randomization during
scanning for Wi-Fi networks, which is done by default.

For one, this allows the user to disable the randomization for whatever
reason.

Also, together with configuring the per-connection setting
wifi.cloned-mac-address=preserve, this allows to disable NetworkManager
to modify the MAC address of the interface. This may allow the user
to set the MAC address outside of NetworkManager without NetworkManager
interfering.
This commit is contained in:
Thomas Haller 2016-06-22 14:42:20 +02:00
parent 767abfa690
commit 7b585bcc93
2 changed files with 32 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
man/NetworkManager.conf.xml
View file

@ -737,6 +737,20 @@ unmanaged=1
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>wifi.scan-rand-mac-address</varname></term>
<listitem>
<para>
Configures the MAC address of a Wi-Fi device during scanning.
This defaults to <literal>yes</literal> in which case a random,
locally-administered MAC address will be confiugred.
Otherwise, the MAC address is left unchanged to whatever was
configured.
For the MAC address used while the device is connected, see instead
the per-connection setting <literal>wifi.cloned-mac-address</literal>.
</para>
</listitem>
</varlistentry>
</variablelist>
</para>
</refsect2>

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

@ -174,7 +174,7 @@ static void ap_add_remove (NMDeviceWifi *self,
static void remove_supplicant_interface_error_handler (NMDeviceWifi *self);
static void _hw_addr_set_scanning (NMDeviceWifi *self);
static void _hw_addr_set_scanning (NMDeviceWifi *self, gboolean do_reset);
/*****************************************************************/
@ -490,7 +490,7 @@ deactivate (NMDevice *device)
nm_platform_wifi_indicate_addressing_running (NM_PLATFORM_GET, ifindex, FALSE);
g_clear_pointer (&priv->hw_addr_scan, g_free);
_hw_addr_set_scanning (self);
_hw_addr_set_scanning (self, TRUE);
/* Ensure we're in infrastructure mode after deactivation; some devices
* (usually older ones) don't scan well in adhoc mode.
@ -1021,11 +1021,12 @@ impl_device_wifi_get_all_access_points (NMDeviceWifi *self,
}
static void
_hw_addr_set_scanning (NMDeviceWifi *self)
_hw_addr_set_scanning (NMDeviceWifi *self, gboolean do_reset)
{
NMDevice *device = (NMDevice *) self;
NMDeviceWifiPrivate *priv;
guint32 now;
gboolean randomize;
g_return_if_fail (NM_IS_DEVICE_WIFI (self));
@ -1035,7 +1036,20 @@ _hw_addr_set_scanning (NMDeviceWifi *self)
priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
randomize = nm_config_data_get_device_config_boolean (NM_CONFIG_GET_DATA,
"wifi.scan-rand-mac-address",
device,
TRUE, TRUE);
if (!randomize) {
g_clear_pointer (&priv->hw_addr_scan, g_free);
if (do_reset)
nm_device_hw_addr_reset (device);
return;
}
now = nm_utils_get_monotonic_timestamp_s ();
if ( !priv->hw_addr_scan
|| now >= priv->hw_addr_scan_expire) {
/* the random MAC address for scanning expires after a while.
@ -1361,7 +1375,7 @@ request_wireless_scan (NMDeviceWifi *self, GVariant *scan_options)
_LOGD (LOGD_WIFI_SCAN, "no SSIDs to probe scan");
}
_hw_addr_set_scanning (self);
_hw_addr_set_scanning (self, FALSE);
if (nm_supplicant_interface_request_scan (priv->sup_iface, ssids)) {
/* success */