colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge: branch 'fg/mac_fixes'

Browse Source
This commit is contained in:
Francesco Giudici
2016-07-22 19:36:38 +02:00
parent e7bd55afdd 60a82e3ff2
commit 84a76a93d9
3 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
clients/cli/connections.c
View File

@@ -1927,17 +1927,22 @@ find_device_for_connection (NmCli *nmc,
if (iface) { if (iface) {
const char *dev_iface = nm_device_get_iface (dev); const char *dev_iface = nm_device_get_iface (dev);
if ( !g_strcmp0 (dev_iface, iface) if (!nm_streq0 (dev_iface, iface))
&& nm_device_connection_compatible (dev, connection, NULL)) { continue;
found_device = dev;
if (!nm_device_connection_compatible (dev, connection, error)) {
g_prefix_error (error, _("device '%s' not compatible with connection '%s':"),
iface, nm_setting_connection_get_id (s_con));
return FALSE;
} }
} else { } else {
if (nm_device_connection_compatible (dev, connection, NULL)) { if (!nm_device_connection_compatible (dev, connection, NULL))
found_device = dev; continue;
}
} }
if (found_device && ap && !strcmp (con_type, NM_SETTING_WIRELESS_SETTING_NAME) && NM_IS_DEVICE_WIFI (dev)) { found_device = dev;
if (ap && !strcmp (con_type, NM_SETTING_WIRELESS_SETTING_NAME) && NM_IS_DEVICE_WIFI (dev)) {
char *bssid_up = g_ascii_strup (ap, -1); char *bssid_up = g_ascii_strup (ap, -1);
const GPtrArray *aps = nm_device_wifi_get_access_points (NM_DEVICE_WIFI (dev)); const GPtrArray *aps = nm_device_wifi_get_access_points (NM_DEVICE_WIFI (dev));
found_device = NULL; /* Mark as not found; set to the device again later, only if AP matches */ found_device = NULL; /* Mark as not found; set to the device again later, only if AP matches */

9
libnm/nm-device-ethernet.c
View File

@@ -227,9 +227,14 @@ connection_compatible (NMDevice *device, NMConnection *connection, GError **erro
perm_addr = nm_device_ethernet_get_permanent_hw_address (NM_DEVICE_ETHERNET (device)); perm_addr = nm_device_ethernet_get_permanent_hw_address (NM_DEVICE_ETHERNET (device));
s_mac = nm_setting_wired_get_mac_address (s_wired); s_mac = nm_setting_wired_get_mac_address (s_wired);
if (perm_addr) { if (perm_addr) {
/* Virtual devices will have empty permanent addr but they should not be excluded
* from the MAC address check specified in the connection */
if (*perm_addr == 0)
perm_addr = nm_device_ethernet_get_hw_address (NM_DEVICE_ETHERNET (device));
if (!nm_utils_hwaddr_valid (perm_addr, ETH_ALEN)) { if (!nm_utils_hwaddr_valid (perm_addr, ETH_ALEN)) {
g_set_error_literal (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_FAILED, g_set_error (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_FAILED,
_("Invalid device MAC address.")); _("Invalid device MAC address %s."), perm_addr);
return FALSE; return FALSE;
} }
if (try_mac && s_mac && !nm_utils_hwaddr_matches (s_mac, -1, perm_addr, -1)) { if (try_mac && s_mac && !nm_utils_hwaddr_matches (s_mac, -1, perm_addr, -1)) {

4
src/devices/nm-device-ethernet.c
View File

@@ -407,7 +407,7 @@ check_connection_compatible (NMDevice *device, NMConnection *connection)
if (!match_subchans (self, s_wired, &try_mac)) if (!match_subchans (self, s_wired, &try_mac))
return FALSE; return FALSE;
perm_hw_addr = nm_device_get_permanent_hw_address (device, FALSE); perm_hw_addr = nm_device_get_permanent_hw_address (device, TRUE);
mac = nm_setting_wired_get_mac_address (s_wired); mac = nm_setting_wired_get_mac_address (s_wired);
if (perm_hw_addr) { if (perm_hw_addr) {
if (try_mac && mac && !nm_utils_hwaddr_matches (mac, -1, perm_hw_addr, -1)) if (try_mac && mac && !nm_utils_hwaddr_matches (mac, -1, perm_hw_addr, -1))
@@ -1421,7 +1421,7 @@ new_default_connection (NMDevice *self)
if (nm_config_get_no_auto_default_for_device (nm_config_get (), self)) if (nm_config_get_no_auto_default_for_device (nm_config_get (), self))
return NULL; return NULL;
perm_hw_addr = nm_device_get_permanent_hw_address (self, FALSE); perm_hw_addr = nm_device_get_permanent_hw_address (self, TRUE);
if (!perm_hw_addr) if (!perm_hw_addr)
return NULL; return NULL;