add support for externally managed ip addresses and routes

diff --git a/interface-ip.c b/interface-ip.c
index e651d39906b1ee5cc18e3eaf982688391ab31c8d..2e2e9d8c5316111b85d54040e61e8cb268072219 100644 (file)
--- a/interface-ip.c
+++ b/interface-ip.c
@@ -24,13 +24,15 @@ interface_update_proto_addr(struct vlist_tree *tree,
 
        if (node_old) {
                addr = container_of(node_old, struct device_addr, node);
-               system_del_address(dev, addr);
+               if (!(addr->flags & DEVADDR_EXTERNAL))
+                       system_del_address(dev, addr);
                free(addr);
        }
 
        if (node_new) {
                addr = container_of(node_new, struct device_addr, node);
-               system_add_address(dev, addr);
+               if (!(addr->flags & DEVADDR_EXTERNAL))
+                       system_add_address(dev, addr);
        }
 }
 
@@ -48,13 +50,15 @@ interface_update_proto_route(struct vlist_tree *tree,
 
        if (node_old) {
                route = container_of(node_old, struct device_route, node);
-               system_del_route(dev, route);
+               if (!(route->flags & DEVADDR_EXTERNAL))
+                       system_del_route(dev, route);
                free(route);
        }
 
        if (node_new) {
                route = container_of(node_new, struct device_route, node);
-               system_add_route(dev, route);
+               if (!(route->flags & DEVADDR_EXTERNAL))
+                       system_add_route(dev, route);
        }
 }
 

diff --git a/interface-ip.h b/interface-ip.h
index 92667278096da88f4c8f41b4ea03f807c89a0307..bf2cf73397f3e4c72760afc0f8a2a6142728ecae 100644 (file)
--- a/interface-ip.h
+++ b/interface-ip.h
@@ -3,12 +3,15 @@
 
 enum device_addr_flags {
        /* address family for routes and addresses */
-       DEVADDR_INET4   = (0 << 0),
-       DEVADDR_INET6   = (1 << 0),
-       DEVADDR_FAMILY  = DEVADDR_INET4 | DEVADDR_INET6,
+       DEVADDR_INET4           = (0 << 0),
+       DEVADDR_INET6           = (1 << 0),
+       DEVADDR_FAMILY          = DEVADDR_INET4 | DEVADDR_INET6,
 
        /* device route (no gateway) */
-       DEVADDR_DEVICE  = (1 << 1),
+       DEVADDR_DEVICE          = (1 << 1),
+
+       /* externally added address */
+       DEVADDR_EXTERNAL        = (1 << 2),
 };
 
 union if_addr {