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

core: use a second startup pass to detect all VLAN interfaces

Browse source 
We can't guarantee the ordering of devices that udev sends to us
on startup.  Thus, a VLAN interface could be sent before its
parent is, and we won't be able to find the parent in the device
list.  But that's fine; all parents will be detected during the
first pass, and we silently fail the VLAN interface.  Then we
do a second pass where any remaining VLAN interfaces will be
created because we found the parents during the first pass.
This commit is contained in:
Dan Williams 2012-03-06 11:05:24 -06:00
parent 8c3ac9bdd8
commit cd2c721762
1 changed files with 34 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/nm-manager.c
View file

@ -2148,6 +2148,12 @@ is_bond (int ifindex)
return (nm_system_get_iface_type (ifindex, NULL) == NM_IFACE_TYPE_BOND);
}
static gboolean
is_vlan (int ifindex)
{
return (nm_system_get_iface_type (ifindex, NULL) == NM_IFACE_TYPE_VLAN);
}
static void
udev_device_added_cb (NMUdevManager *udev_mgr,
GUdevDevice *udev_device,
@ -2202,7 +2208,26 @@ udev_device_added_cb (NMUdevManager *udev_mgr,
device = nm_device_infiniband_new (sysfs_path, iface, driver);
else if (is_bond (ifindex))
device = nm_device_bond_new (sysfs_path, iface);
else
else if (is_vlan (ifindex)) {
int parent_ifindex = -1;
NMDevice *parent;
/* Have to find the parent device */
if (nm_system_get_iface_vlan_info (ifindex, &parent_ifindex, NULL)) {
parent = find_device_by_ifindex (self, parent_ifindex);
if (parent)
device = nm_device_vlan_new (sysfs_path, iface, parent);
else {
/* If udev signaled the VLAN interface before it signaled
* the VLAN's parent at startup we may not know about the
* parent device yet. But we'll find it on the second pass
* from nm_manager_start().
*/
nm_log_dbg (LOGD_HW, "(%s): VLAN parent interface unknown", iface);
}
} else
nm_log_err (LOGD_HW, "(%s): failed to get VLAN parent ifindex", iface);
} else
device = nm_device_ethernet_new (sysfs_path, iface, driver);
}
@ -3642,6 +3667,14 @@ nm_manager_start (NMManager *self)
nm_udev_manager_query_devices (priv->udev_mgr);
bluez_manager_resync_devices (self);
/* Query devices again to ensure that we catch all virtual interfaces (like
* VLANs) that require a parent. If during the first pass the VLAN
* interface was detected first, the parent wouldn't exist yet and creating
* the VLAN would fail. The second query ensures that we'll have a valid
* parent for the VLAN during the second pass.
*/
nm_udev_manager_query_devices (priv->udev_mgr);
/*
* Connections added before the manager is started do not emit
* connection-added signals thus devices have to be created manually.