shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-06 08:26:52 +03:00
Code

networkd: manager - drop links and netdevs when we receive DELLINK

Browse Source
This commit is contained in:
Tom Gundersen 2014-05-08 18:55:11 +02:00
parent 37ebeb77cf
commit f22364691b
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/network/networkd-manager.c
View File

@ -219,6 +219,7 @@ static int manager_udev_process_link(Manager *m, struct udev_device *device) {
static int manager_rtnl_process_link(sd_rtnl *rtnl, sd_rtnl_message *message, void *userdata) { static int manager_rtnl_process_link(sd_rtnl *rtnl, sd_rtnl_message *message, void *userdata) {
Manager *m = userdata; Manager *m = userdata;
Link *link = NULL; Link *link = NULL;
uint16_t type;
char *name; char *name;
int r, ifindex; int r, ifindex;
@ -226,6 +227,12 @@ static int manager_rtnl_process_link(sd_rtnl *rtnl, sd_rtnl_message *message, vo
assert(message); assert(message);
assert(m); assert(m);
r = sd_rtnl_message_get_type(message, &type);
if (r < 0) {
log_warning("rtnl: could not get message type");
return 0;
}
r = sd_rtnl_message_link_get_ifindex(message, &ifindex); r = sd_rtnl_message_link_get_ifindex(message, &ifindex);
if (r < 0 || ifindex <= 0) { if (r < 0 || ifindex <= 0) {
log_warning("rtnl: received link message without valid ifindex"); log_warning("rtnl: received link message without valid ifindex");
@ -233,7 +240,9 @@ static int manager_rtnl_process_link(sd_rtnl *rtnl, sd_rtnl_message *message, vo
} }
link_get(m, ifindex, &link); link_get(m, ifindex, &link);
if (!link) { if (type == RTM_DELLINK)
link_drop(link);
else if (!link) {
/* link is new, so add it */ /* link is new, so add it */
r = link_add(m, message, &link); r = link_add(m, message, &link);
if (r < 0) { if (r < 0) {
@ -246,10 +255,12 @@ static int manager_rtnl_process_link(sd_rtnl *rtnl, sd_rtnl_message *message, vo
if (r < 0) if (r < 0)
log_warning("rtnl: received link message without valid ifname"); log_warning("rtnl: received link message without valid ifname");
else { else {
NetDev *netdev; NetDev *netdev = NULL;
r = netdev_get(m, name, &netdev); netdev_get(m, name, &netdev);
if (r >= 0) { if (type == RTM_DELLINK)
netdev_drop(netdev);
else if (netdev) {
r = netdev_set_ifindex(netdev, message); r = netdev_set_ifindex(netdev, message);
if (r < 0) { if (r < 0) {
log_debug("could not set ifindex on netdev"); log_debug("could not set ifindex on netdev");
@ -258,9 +269,11 @@ static int manager_rtnl_process_link(sd_rtnl *rtnl, sd_rtnl_message *message, vo
} }
} }
r = link_update(link, message); if (type == RTM_NEWLINK) {
if (r < 0) r = link_update(link, message);
return 0; if (r < 0)
return 0;
}
return 1; return 1;
} }
@ -358,6 +371,10 @@ int manager_rtnl_listen(Manager *m) {
if (r < 0) if (r < 0)
return r; return r;
r = sd_rtnl_add_match(m->rtnl, RTM_DELLINK, &manager_rtnl_process_link, m);
if (r < 0)
return r;
return 0; return 0;
} }