SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

networkd: make sure Network and Link can always be freed

Browse Source 
Also, don't fail a link just because we can't find its MAC address.
This commit is contained in:
Tom Gundersen
2013-11-21 21:04:04 +01:00
parent 602cc437e8
commit 5a3eb5a77d
2 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/networkd-link.c
+8 -11
View File
@@ -39,22 +39,19 @@ int link_new(Manager *manager, struct udev_device *device, Link **ret) {
if (!link)
return -ENOMEM;
link->manager = manager;
link->state = _LINK_STATE_INVALID;
link->ifindex = udev_device_get_ifindex(device);
if (link->ifindex <= 0)
return -EINVAL;
mac = udev_device_get_sysattr_value(device, "address");
if (!mac)
return -EINVAL;
mac_addr = ether_aton(mac);
if (!mac_addr)
return -EINVAL;
memcpy(&link->mac, mac_addr, sizeof(struct ether_addr));
link->manager = manager;
link->state = _LINK_STATE_INVALID;
if (mac) {
mac_addr = ether_aton(mac);
if (mac_addr)
memcpy(&link->mac, mac_addr, sizeof(struct ether_addr));
}
r = hashmap_put(manager->links, &link->ifindex, link);
if (r < 0)