interface: fix moving interface address routes to the table specified by ip[46]table

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

diff --git a/interface-ip.c b/interface-ip.c
index 18dd2fa..220f4a0 100644 (file)
--- a/interface-ip.c
+++ b/interface-ip.c
@@ -441,6 +441,7 @@ interface_handle_subnet_route(struct interface *iface, struct device_addr *addr,
 {
        struct device *dev = iface->l3_dev.dev;
        struct device_route route;
 {
        struct device *dev = iface->l3_dev.dev;
        struct device_route route;

+       bool v6 = ((addr->flags & DEVADDR_FAMILY) == DEVADDR_INET6);

 
        if (addr->flags & DEVADDR_OFFLINK)
                return;
 
        if (addr->flags & DEVADDR_OFFLINK)
                return;


@@ -458,6 +459,9 @@ interface_handle_subnet_route(struct interface *iface, struct device_addr *addr,
 
                route.flags &= ~DEVADDR_KERNEL;
                route.metric = iface->metric;
 
                route.flags &= ~DEVADDR_KERNEL;
                route.metric = iface->metric;

+               route.table = (v6) ? iface->ip6table : iface->ip4table;
+               if (route.table)
+                       route.flags |= DEVROUTE_SRCTABLE;

                system_add_route(dev, &route);
        } else {
                system_del_route(dev, &route);
                system_add_route(dev, &route);
        } else {
                system_del_route(dev, &route);


@@ -490,11 +494,17 @@ interface_update_proto_addr(struct vlist_tree *tree,
                if ((a_new->flags & DEVADDR_FAMILY) == DEVADDR_INET4 &&
                    !a_new->broadcast) {
 
                if ((a_new->flags & DEVADDR_FAMILY) == DEVADDR_INET4 &&
                    !a_new->broadcast) {
 

-                       uint32_t mask = ~0;
-                       uint32_t *a = (uint32_t *) &a_new->addr;
+                       /* /31 and /32 addressing need 255.255.255.255
+                        * as broadcast address. */
+                       if (a_new->mask >= 31) {
+                               a_new->broadcast = (uint32_t) ~0;
+                       } else {
+                               uint32_t mask = ~0;
+                               uint32_t *a = (uint32_t *) &a_new->addr;

 
 

-                       mask >>= a_new->mask;
-                       a_new->broadcast = *a | htonl(mask);
+                               mask >>= a_new->mask;
+                               a_new->broadcast = *a | htonl(mask);
+                       }

                }
        }
 
                }
        }
 


@@ -517,26 +527,22 @@ interface_update_proto_addr(struct vlist_tree *tree,
        }
 
        if (node_old) {
        }
 
        if (node_old) {

-               if (!(a_old->flags & DEVADDR_EXTERNAL) && a_old->enabled && !keep) {
-                       interface_handle_subnet_route(iface, a_old, false);
-
+               if (a_old->enabled && !keep) {

                        if ((a_old->flags & DEVADDR_FAMILY) == DEVADDR_INET6)
                                v6 = true;
 
                        if ((a_old->flags & DEVADDR_FAMILY) == DEVADDR_INET6)
                                v6 = true;
 

-                       unsigned int table = (v6) ? iface->ip6table : iface->ip4table;
-

                        //This is needed for source routing to work correctly. If a device
                        //has two connections to a network using the same subnet, adding
                        //only the network-rule will cause packets to be routed through the
                        //first matching network (source IP matches both masks).
                        //This is needed for source routing to work correctly. If a device
                        //has two connections to a network using the same subnet, adding
                        //only the network-rule will cause packets to be routed through the
                        //first matching network (source IP matches both masks).

-                       if (table) {
+                       if (a_old->policy_table)

                                set_ip_source_policy(false, v6, IPRULE_PRIORITY_ADDR, &a_old->addr,
                                set_ip_source_policy(false, v6, IPRULE_PRIORITY_ADDR, &a_old->addr,

-                                               (v6) ? 128 : 32, table, NULL, NULL);
-                               set_ip_source_policy(false, v6, IPRULE_PRIORITY_NW, &a_old->addr,
-                                               a_old->mask, table, NULL, NULL);
-                       }
+                                               (v6) ? 128 : 32, a_old->policy_table, NULL, NULL);

 
 

-                       system_del_address(dev, a_old);
+                       if (!(a_old->flags & DEVADDR_EXTERNAL)) {
+                               interface_handle_subnet_route(iface, a_old, false);
+                               system_del_address(dev, a_old);
+                       }

                }
                free(a_old->pclass);
                free(a_old);
                }
                free(a_old->pclass);
                free(a_old);


@@ -544,26 +550,26 @@ interface_update_proto_addr(struct vlist_tree *tree,
 
        if (node_new) {
                a_new->enabled = true;
 
        if (node_new) {
                a_new->enabled = true;

-               if (!(a_new->flags & DEVADDR_EXTERNAL) && (!keep || replace)) {
-                       if (system_add_address(dev, a_new))
-                               a_new->failed = true;

 
 

-                       if (!keep) {
-                               if ((a_new->flags & DEVADDR_FAMILY) == DEVADDR_INET6)
-                                       v6 = true;
+               if ((a_new->flags & DEVADDR_FAMILY) == DEVADDR_INET6)
+                               v6 = true;

 
 

-                               unsigned int table = (v6) ? iface->ip6table : iface->ip4table;
+               a_new->policy_table = (v6) ? iface->ip6table : iface->ip4table;

 
 

-                               if (table) {
-                                       set_ip_source_policy(true, v6, IPRULE_PRIORITY_ADDR, &a_new->addr,
-                                                       (v6) ? 128 : 32, table, NULL, NULL);
-                                       set_ip_source_policy(true, v6, IPRULE_PRIORITY_NW, &a_new->addr,
-                                                       a_new->mask, table, NULL, NULL);
-                               }
+               if (!keep || replace) {
+                       if (!(a_new->flags & DEVADDR_EXTERNAL)) {
+                               if (system_add_address(dev, a_new))
+                                       a_new->failed = true;
+
+                               if (iface->metric || a_new->policy_table)
+                                       interface_handle_subnet_route(iface, a_new, true);

                        }
 
                        }
 

-                       if (iface->metric)
-                               interface_handle_subnet_route(iface, a_new, true);
+                       if (!keep) {
+                               if (a_new->policy_table)
+                                       set_ip_source_policy(true, v6, IPRULE_PRIORITY_ADDR, &a_new->addr,
+                                                       (v6) ? 128 : 32, a_new->policy_table, NULL, NULL);
+                       }

                }
        }
 }
                }
        }
 }


@@ -601,7 +607,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) &&
        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->valid_until == route_new->valid_until) && !route_old->failed;
+                       !route_old->failed;

 
        if (node_old) {
                if (!(route_old->flags & DEVADDR_EXTERNAL) && route_old->enabled && !keep)
 
        if (node_old) {
                if (!(route_old->flags & DEVADDR_EXTERNAL) && route_old->enabled && !keep)


@@ -710,7 +716,9 @@ interface_set_prefix_address(struct device_prefix_assignment *assignment,
        struct device *l3_downlink = iface->l3_dev.dev;
 
        struct device_addr addr;
        struct device *l3_downlink = iface->l3_dev.dev;
 
        struct device_addr addr;

+       struct device_route route;

        memset(&addr, 0, sizeof(addr));
        memset(&addr, 0, sizeof(addr));

+       memset(&route, 0, sizeof(route));

 
        if (IN6_IS_ADDR_UNSPECIFIED(&assignment->addr)) {
                addr.addr.in6 = prefix->addr;
 
        if (IN6_IS_ADDR_UNSPECIFIED(&assignment->addr)) {
                addr.addr.in6 = prefix->addr;


@@ -722,15 +730,14 @@ interface_set_prefix_address(struct device_prefix_assignment *assignment,
                addr.addr.in6 = assignment->addr;
 
        addr.mask = assignment->length;
                addr.addr.in6 = assignment->addr;
 
        addr.mask = assignment->length;

-       addr.flags = DEVADDR_INET6;
+       addr.flags = DEVADDR_INET6 | DEVADDR_OFFLINK;

        addr.preferred_until = prefix->preferred_until;
        addr.valid_until = prefix->valid_until;
 
        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;
-       }
+       route.flags = DEVADDR_INET6;
+       route.mask = addr.mask < 64 ? 64 : addr.mask;
+       route.addr = addr.addr;
+       clear_if_addr(&route.addr, route.mask);

 
        if (!add && assignment->enabled) {
                time_t now = system_get_rtime();
 
        if (!add && assignment->enabled) {
                time_t now = system_get_rtime();


@@ -738,8 +745,6 @@ interface_set_prefix_address(struct device_prefix_assignment *assignment,
                if (!addr.valid_until || addr.valid_until - now > 7200)
                        addr.valid_until = now + 7200;
 
                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
-

                if (prefix->iface) {
                        if (prefix->iface->ip6table)
                                set_ip_source_policy(false, true, IPRULE_PRIORITY_NW, &addr.addr,
                if (prefix->iface) {
                        if (prefix->iface->ip6table)
                                set_ip_source_policy(false, true, IPRULE_PRIORITY_NW, &addr.addr,


@@ -749,16 +754,12 @@ interface_set_prefix_address(struct device_prefix_assignment *assignment,
                                                        addr.mask, 0, iface, "unreachable");
                }
 
                                                        addr.mask, 0, iface, "unreachable");
                }
 

-               if (addr.mask < 64)
-                       addr.mask = 64;
-
-               interface_handle_subnet_route(iface, &addr, false);
+               system_del_route(l3_downlink, &route);

                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)) {
                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,
 
                if (prefix->iface && !assignment->enabled) {
                        set_ip_source_policy(true, true, IPRULE_PRIORITY_REJECT, &addr.addr,


@@ -769,15 +770,14 @@ interface_set_prefix_address(struct device_prefix_assignment *assignment,
                                                addr.mask, prefix->iface->ip6table, iface, NULL);
                }
 
                                                addr.mask, prefix->iface->ip6table, iface, NULL);
                }
 

-               if (addr.mask < 64)
-                       addr.mask = 64;
+               route.metric = iface->metric;
+               system_add_route(l3_downlink, &route);

 
 

-               interface_handle_subnet_route(iface, &addr, true);
+               if (uplink && uplink->l3_dev.dev && !(l3_downlink->settings.flags & DEV_OPT_MTU6)) {
+                       int mtu = system_update_ipv6_mtu(uplink->l3_dev.dev, 0);
+                       int mtu_old = system_update_ipv6_mtu(l3_downlink, 0);

 
 

-               if (uplink && uplink->l3_dev.dev) {
-                       int mtu = system_update_ipv6_mtu(
-                                       uplink->l3_dev.dev, 0);
-                       if (mtu > 0)
+                       if (mtu > 0 && mtu_old > mtu)

                                system_update_ipv6_mtu(l3_downlink, mtu);
                }
 
                                system_update_ipv6_mtu(l3_downlink, mtu);
                }
 


@@ -1223,6 +1223,8 @@ void interface_ip_set_enabled(struct interface_ip_settings *ip, bool enabled)
                return;
 
        vlist_for_each_element(&ip->addr, addr, node) {
                return;
 
        vlist_for_each_element(&ip->addr, addr, node) {

+               bool v6 = ((addr->flags & DEVADDR_FAMILY) == DEVADDR_INET6) ? true : false;
+

                if (addr->enabled == enabled)
                        continue;
 
                if (addr->enabled == enabled)
                        continue;
 


@@ -1230,9 +1232,18 @@ void interface_ip_set_enabled(struct interface_ip_settings *ip, bool enabled)
                        system_add_address(dev, addr);
                        if (iface->metric)
                                interface_handle_subnet_route(iface, addr, true);
                        system_add_address(dev, addr);
                        if (iface->metric)
                                interface_handle_subnet_route(iface, addr, true);

+
+                       addr->policy_table = (v6) ? iface->ip6table : iface->ip4table;
+                       if (addr->policy_table)
+                               set_ip_source_policy(true, v6, IPRULE_PRIORITY_ADDR, &addr->addr,
+                                               (v6) ? 128 : 32, addr->policy_table, NULL, NULL);

                } else {
                        interface_handle_subnet_route(iface, addr, false);
                        system_del_address(dev, addr);
                } else {
                        interface_handle_subnet_route(iface, addr, false);
                        system_del_address(dev, addr);

+
+                       if (addr->policy_table)
+                               set_ip_source_policy(false, v6, IPRULE_PRIORITY_ADDR, &addr->addr,
+                                               (v6) ? 128 : 32, addr->policy_table, NULL, NULL);

                }
                addr->enabled = enabled;
        }
                }
                addr->enabled = enabled;
        }


@@ -1250,6 +1261,15 @@ void interface_ip_set_enabled(struct interface_ip_settings *ip, bool enabled)
                        if (!(route->flags & DEVROUTE_METRIC))
                                route->metric = ip->iface->metric;
 
                        if (!(route->flags & DEVROUTE_METRIC))
                                route->metric = ip->iface->metric;
 

+                       if (!(route->flags & DEVROUTE_TABLE)) {
+                               route->flags &= ~DEVROUTE_SRCTABLE;
+                               route->table = ((route->flags & DEVADDR_FAMILY) == DEVADDR_INET6) ?
+                                                       iface->ip6table : iface->ip4table;
+
+                               if (route->table)
+                                       route->flags |= DEVROUTE_SRCTABLE;
+                       }
+

                        if (system_add_route(dev, route))
                                route->failed = true;
                } else
                        if (system_add_route(dev, route))
                                route->failed = true;
                } else