netifd : Apply interface metric on subnet routes when reloading ip

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

diff --git a/interface-ip.c b/interface-ip.c
index 715e498..6659f8b 100644 (file)
--- a/interface-ip.c
+++ b/interface-ip.c
@@ -75,8 +75,8 @@ clear_if_addr(union if_addr *a, int mask)
        uint8_t m_clear = (1 << (m_bytes * 8 - mask)) - 1;
        uint8_t *p = (uint8_t *) a;
 
-       if (m_bytes < sizeof(a))
-               memset(p + m_bytes, 0, sizeof(a) - m_bytes);
+       if (m_bytes < sizeof(*a))
+               memset(p + m_bytes, 0, sizeof(*a) - m_bytes);
 
        p[m_bytes - 1] &= ~m_clear;
 }
@@ -365,6 +365,10 @@ interface_ip_add_route(struct interface *iface, struct blob_attr *attr, bool v6)
                        goto error;
                }
 
+               /* only set the table flag if not using the main (default) table */
+               if (system_is_default_rt_table(route->table))
+                       route->table = 0;
+
                if (route->table)
                        route->flags |= DEVROUTE_TABLE;
        }
@@ -597,7 +601,7 @@ interface_update_proto_route(struct vlist_tree *tree,
        if (node_old && node_new)
                keep = !memcmp(&route_old->nexthop, &route_new->nexthop, sizeof(route_old->nexthop)) &&
                        (route_old->mtu == route_new->mtu) && (route_old->type == route_new->type) &&
-                       !route_old->failed;
+                       (route_old->valid_until == route_new->valid_until) && !route_old->failed;
 
        if (node_old) {
                if (!(route_old->flags & DEVADDR_EXTERNAL) && route_old->enabled && !keep)
@@ -665,13 +669,20 @@ interface_set_prefix_address(struct device_prefix_assignment *assignment,
        addr.preferred_until = prefix->preferred_until;
        addr.valid_until = prefix->valid_until;
 
+       if (addr.mask < 64) {
+               addr.mask = 64;
+               system_del_address(l3_downlink, &addr);
+               addr.mask = assignment->length;
+       }
+
        if (!add && assignment->enabled) {
                time_t now = system_get_rtime();
                addr.preferred_until = now;
                if (!addr.valid_until || addr.valid_until - now > 7200)
                        addr.valid_until = now + 7200;
+
                system_del_address(l3_downlink, &addr); // Work around dangling prefix routes
-               system_add_address(l3_downlink, &addr);
+
                if (prefix->iface) {
                        if (prefix->iface->ip6table)
                                set_ip_source_policy(false, true, IPRULE_PRIORITY_NW, &addr.addr,
@@ -681,9 +692,17 @@ interface_set_prefix_address(struct device_prefix_assignment *assignment,
                                                        addr.mask, 0, iface, "unreachable");
                }
 
+               if (addr.mask < 64)
+                       addr.mask = 64;
+
+               interface_handle_subnet_route(iface, &addr, false);
+               system_add_address(l3_downlink, &addr);
+
                assignment->enabled = false;
        } else if (add && (iface->state == IFS_UP || iface->state == IFS_SETUP) &&
                        !system_add_address(l3_downlink, &addr)) {
+               interface_handle_subnet_route(iface, &addr, false);
+
                if (prefix->iface && !assignment->enabled) {
                        set_ip_source_policy(true, true, IPRULE_PRIORITY_REJECT, &addr.addr,
                                        addr.mask, 0, iface, "unreachable");
@@ -692,12 +711,19 @@ interface_set_prefix_address(struct device_prefix_assignment *assignment,
                                set_ip_source_policy(true, true, IPRULE_PRIORITY_NW, &addr.addr,
                                                addr.mask, prefix->iface->ip6table, iface, NULL);
                }
+
+               if (addr.mask < 64)
+                       addr.mask = 64;
+
+               interface_handle_subnet_route(iface, &addr, true);
+
                if (uplink && uplink->l3_dev.dev) {
                        int mtu = system_update_ipv6_mtu(
                                        uplink->l3_dev.dev, 0);
                        if (mtu > 0)
                                system_update_ipv6_mtu(l3_downlink, mtu);
                }
+
                assignment->enabled = true;
        }
 }
@@ -1128,9 +1154,11 @@ void interface_ip_set_enabled(struct interface_ip_settings *ip, bool enabled)
        struct device_addr *addr;
        struct device_route *route;
        struct device *dev;
+       struct interface *iface;
 
        ip->enabled = enabled;
-       dev = ip->iface->l3_dev.dev;
+       iface = ip->iface;
+       dev = iface->l3_dev.dev;
        if (!dev)
                return;
 
@@ -1138,10 +1166,14 @@ void interface_ip_set_enabled(struct interface_ip_settings *ip, bool enabled)
                if (addr->enabled == enabled)
                        continue;
 
-               if (enabled)
+               if (enabled) {
                        system_add_address(dev, addr);
-               else
+                       if ((addr->flags & DEVADDR_OFFLINK) || iface->metric)
+                               interface_handle_subnet_route(iface, addr, true);
+               } else {
+                       interface_handle_subnet_route(iface, addr, false);
                        system_del_address(dev, addr);
+               }
                addr->enabled = enabled;
        }