dump interface routes via ubus

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

diff --git a/interface-ip.c b/interface-ip.c
index 51612fa..8c46168 100644 (file)
--- a/interface-ip.c
+++ b/interface-ip.c
@@ -64,6 +64,7 @@ interface_ip_add_route(struct interface *iface, struct blob_attr *attr, bool v6)
        if (!route)
                return;
 
+       route->flags = v6 ? DEVADDR_INET6 : DEVADDR_INET4;
        route->mask = v6 ? 128 : 32;
        if ((cur = tb[ROUTE_MASK]) != NULL) {
                route->mask = parse_netmask_string(blobmsg_data(cur), v6);
@@ -83,12 +84,12 @@ interface_ip_add_route(struct interface *iface, struct blob_attr *attr, bool v6)
                        DPRINTF("Failed to parse route gateway: %s\n", (char *) blobmsg_data(cur));
                        goto error;
                }
-       } else {
-               route->flags |= DEVADDR_DEVICE;
        }
 
-       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);
@@ -376,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;
        }