interface-ip: Fix broadcast address when using /31 or /32 IPv4 addressing

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

diff --git a/interface-ip.c b/interface-ip.c
index aec3892..54f56d6 100644 (file)
--- a/interface-ip.c
+++ b/interface-ip.c
@@ -133,23 +133,6 @@ static int set_ip_source_policy(bool add, bool v6, unsigned int priority,
        return (add) ? system_add_iprule(&rule) : system_del_iprule(&rule);
 }
 
-static int set_ip_lo_policy(bool add, bool v6, struct interface *iface)
-{
-       struct iprule rule = {
-               .flags = IPRULE_IN | IPRULE_LOOKUP | IPRULE_PRIORITY,
-               .priority = IPRULE_PRIORITY_NW + iface->l3_dev.dev->ifindex,
-               .lookup = (v6) ? iface->ip6table : iface->ip4table,
-               .in_dev = "lo"
-       };
-
-       if (!rule.lookup)
-               return 0;
-
-       rule.flags |= (v6) ? IPRULE_INET6 : IPRULE_INET4;
-
-       return (add) ? system_add_iprule(&rule) : system_del_iprule(&rule);
-}
-
 static bool
 __find_ip_addr_target(struct interface_ip_settings *ip, union if_addr *a, bool v6)
 {
@@ -490,11 +473,17 @@ interface_update_proto_addr(struct vlist_tree *tree,
                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,9 +506,7 @@ interface_update_proto_addr(struct vlist_tree *tree,
        }
 
        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;
 
@@ -532,11 +519,16 @@ interface_update_proto_addr(struct vlist_tree *tree,
                        if (table) {
                                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);
+
+                               if (a_old->mask != ((v6) ? 128 : 32))
+                                       set_ip_source_policy(false, v6, IPRULE_PRIORITY_NW, &a_old->addr,
+                                                       a_old->mask, 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);
@@ -544,9 +536,14 @@ interface_update_proto_addr(struct vlist_tree *tree,
 
        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 || replace) {
+                       if (!(a_new->flags & DEVADDR_EXTERNAL)) {
+                               if (system_add_address(dev, a_new))
+                                       a_new->failed = true;
+
+                               if (iface->metric)
+                                       interface_handle_subnet_route(iface, a_new, true);
+                       }
 
                        if (!keep) {
                                if ((a_new->flags & DEVADDR_FAMILY) == DEVADDR_INET6)
@@ -557,13 +554,12 @@ interface_update_proto_addr(struct vlist_tree *tree,
                                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 (a_new->mask != ((v6) ? 128 : 32))
+                                               set_ip_source_policy(true, v6, IPRULE_PRIORITY_NW, &a_new->addr,
+                                                               a_new->mask, table, NULL, NULL);
                                }
                        }
-
-                       if (iface->metric)
-                               interface_handle_subnet_route(iface, a_new, true);
                }
        }
 }
@@ -601,7 +597,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->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)
@@ -767,10 +763,11 @@ interface_set_prefix_address(struct device_prefix_assignment *assignment,
                route.metric = iface->metric;
                system_add_route(l3_downlink, &route);
 
-               if (uplink && uplink->l3_dev.dev) {
-                       int mtu = system_update_ipv6_mtu(
-                                       uplink->l3_dev.dev, 0);
-                       if (mtu > 0)
+               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 (mtu > 0 && mtu_old > mtu)
                                system_update_ipv6_mtu(l3_downlink, mtu);
                }
 
@@ -1243,6 +1240,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_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
@@ -1257,13 +1263,9 @@ void interface_ip_set_enabled(struct interface_ip_settings *ip, bool enabled)
                        if (!strcmp(a->name, ip->iface->name))
                                interface_set_prefix_address(a, c, ip->iface, enabled);
 
-       if (ip->iface && ip->iface->l3_dev.dev) {
-               set_ip_lo_policy(enabled, true, ip->iface);
-               set_ip_lo_policy(enabled, false, ip->iface);
-
+       if (ip->iface && ip->iface->l3_dev.dev)
                set_ip_source_policy(enabled, true, IPRULE_PRIORITY_REJECT + ip->iface->l3_dev.dev->ifindex,
                        NULL, 0, 0, ip->iface, "failed_policy");
-       }
 }
 
 void