fix flushing routes/addresses on connection loss

[project/netifd.git] / interface-ip.c

diff --git a/interface-ip.c b/interface-ip.c
index 170b03b..bbf2ccf 100644 (file)
--- a/interface-ip.c
+++ b/interface-ip.c
@@ -86,8 +86,10 @@ interface_ip_add_route(struct interface *iface, struct blob_attr *attr, bool v6)
                }
        }
 
-       if ((cur = tb[ROUTE_METRIC]) != NULL)
+       if ((cur = tb[ROUTE_METRIC]) != NULL) {
                route->metric = blobmsg_get_u32(cur);
+               route->flags |= DEVROUTE_METRIC;
+       }
 
        if ((cur = tb[ROUTE_MTU]) != NULL)
                route->mtu = blobmsg_get_u32(cur);
@@ -126,7 +128,7 @@ interface_update_proto_addr(struct vlist_tree *tree,
 
        ip = container_of(tree, struct interface_ip_settings, addr);
        iface = ip->iface;
-       dev = iface->l3_dev->dev;
+       dev = iface->l3_dev.dev;
 
        if (node_new) {
                a_new = container_of(node_new, struct device_addr, node);
@@ -191,7 +193,7 @@ interface_update_proto_route(struct vlist_tree *tree,
 
        ip = container_of(tree, struct interface_ip_settings, route);
        iface = ip->iface;
-       dev = iface->l3_dev->dev;
+       dev = iface->l3_dev.dev;
 
        route_old = container_of(node_old, struct device_route, node);
        route_new = container_of(node_new, struct device_route, node);
@@ -351,7 +353,7 @@ void interface_ip_set_enabled(struct interface_ip_settings *ip, bool enabled)
        struct device *dev;
 
        ip->enabled = enabled;
-       dev = ip->iface->l3_dev->dev;
+       dev = ip->iface->l3_dev.dev;
        if (!dev)
                return;
 
@@ -375,9 +377,12 @@ void interface_ip_set_enabled(struct interface_ip_settings *ip, bool enabled)
                if (route->enabled == _enabled)
                        continue;
 
-               if (_enabled)
+               if (_enabled) {
+                       if (!(route->flags & DEVROUTE_METRIC))
+                               route->metric = ip->iface->metric;
+
                        system_add_route(dev, route);
-               else
+               } else
                        system_del_route(dev, route);
                route->enabled = _enabled;
        }