Fix network interface deletion handling in kernel-netlink plugin.
authorMirko Parthey <mirko.parthey@informatik.tu-chemnitz.de>
Mon, 14 Nov 2011 14:24:48 +0000 (15:24 +0100)
committerTobias Brunner <tobias@strongswan.org>
Mon, 14 Nov 2011 14:24:48 +0000 (15:24 +0100)
When the kernel reports the deletion of an interface (RTM_DELLINK),
the cached interface attributes, including ifindex, become invalid
and must be forgotten.

Interface link state changes ("up" and "down") show up as RTM_NEWLINK,
so they will not cause a cached entry to be removed or
prevent listening to address change notifications.

Once an interface has been deleted, the kernel ought to stop sending
notifications for it. If the interface gets recreated with the same
name later, the kernel again reports RTM_NEWLINK, which causes a new
cache entry to be created.

There should be no reason to keep a stale cache entry around, as was
claimed in the comment.

src/libhydra/plugins/kernel_netlink/kernel_netlink_net.c

index 2196575..31f3844 100644 (file)
@@ -375,9 +375,13 @@ static void process_link(private_kernel_netlink_net_t *this,
                        {
                                if (current->ifindex == msg->ifi_index)
                                {
                        {
                                if (current->ifindex == msg->ifi_index)
                                {
-                                       /* we do not remove it, as an address may be added to a
-                                        * "down" interface and we wan't to know that. */
-                                       current->flags = msg->ifi_flags;
+                                       if (event)
+                                       {
+                                               update = TRUE;
+                                               DBG1(DBG_KNL, "interface %s deleted", current->ifname);
+                                       }
+                                       this->ifaces->remove_at(this->ifaces, enumerator);
+                                       iface_entry_destroy(current);
                                        break;
                                }
                        }
                                        break;
                                }
                        }