summaryrefslogtreecommitdiff
path: root/src/network
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2014-05-08 18:55:11 +0200
committerTom Gundersen <teg@jklm.no>2014-05-09 14:41:27 +0200
commitf22364691bafc834a41cbe106f73f3da1a78d57f (patch)
tree995b8f59cd7c5eefd769e68bd713882051e54a00 /src/network
parent37ebeb77cf94ef0222cbe3b19eaad8a0a53702f1 (diff)
networkd: manager - drop links and netdevs when we receive DELLINK
Diffstat (limited to 'src/network')
-rw-r--r--src/network/networkd-manager.c31
1 files changed, 24 insertions, 7 deletions
diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index 71c54254e3..40a088b73f 100644
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -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) {
Manager *m = userdata;
Link *link = NULL;
+ uint16_t type;
char *name;
int r, ifindex;
@@ -226,6 +227,12 @@ static int manager_rtnl_process_link(sd_rtnl *rtnl, sd_rtnl_message *message, vo
assert(message);
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);
if (r < 0 || ifindex <= 0) {
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);
- if (!link) {
+ if (type == RTM_DELLINK)
+ link_drop(link);
+ else if (!link) {
/* link is new, so add it */
r = link_add(m, message, &link);
if (r < 0) {
@@ -246,10 +255,12 @@ static int manager_rtnl_process_link(sd_rtnl *rtnl, sd_rtnl_message *message, vo
if (r < 0)
log_warning("rtnl: received link message without valid ifname");
else {
- NetDev *netdev;
+ NetDev *netdev = NULL;
- r = netdev_get(m, name, &netdev);
- if (r >= 0) {
+ netdev_get(m, name, &netdev);
+ if (type == RTM_DELLINK)
+ netdev_drop(netdev);
+ else if (netdev) {
r = netdev_set_ifindex(netdev, message);
if (r < 0) {
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 (r < 0)
- return 0;
+ if (type == RTM_NEWLINK) {
+ r = link_update(link, message);
+ if (r < 0)
+ return 0;
+ }
return 1;
}
@@ -358,6 +371,10 @@ int manager_rtnl_listen(Manager *m) {
if (r < 0)
return r;
+ r = sd_rtnl_add_match(m->rtnl, RTM_DELLINK, &manager_rtnl_process_link, m);
+ if (r < 0)
+ return r;
+
return 0;
}