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 54f56d6..220f4a0 100644 (file)
--- a/interface-ip.c
+++ b/interface-ip.c
@@ -133,6 +133,23 @@ 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)
 {
@@ -424,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;
+       bool v6 = ((addr->flags & DEVADDR_FAMILY) == DEVADDR_INET6);
 
        if (addr->flags & DEVADDR_OFFLINK)
                return;
@@ -441,6 +459,9 @@ interface_handle_subnet_route(struct interface *iface, struct device_addr *addr,
 
                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);
@@ -510,20 +531,13 @@ interface_update_proto_addr(struct vlist_tree *tree,
                        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).
-                       if (table) {
+                       if (a_old->policy_table)
                                set_ip_source_policy(false, v6, IPRULE_PRIORITY_ADDR, &a_old->addr,
-                                               (v6) ? 128 : 32, 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);
-                       }
+                                               (v6) ? 128 : 32, a_old->policy_table, NULL, NULL);
 
                        if (!(a_old->flags & DEVADDR_EXTERNAL)) {
                                interface_handle_subnet_route(iface, a_old, false);
@@ -536,29 +550,25 @@ interface_update_proto_addr(struct vlist_tree *tree,
 
        if (node_new) {
                a_new->enabled = true;
+
+               if ((a_new->flags & DEVADDR_FAMILY) == DEVADDR_INET6)
+                               v6 = true;
+
+               a_new->policy_table = (v6) ? iface->ip6table : iface->ip4table;
+
                if (!keep || replace) {
                        if (!(a_new->flags & DEVADDR_EXTERNAL)) {
                                if (system_add_address(dev, a_new))
                                        a_new->failed = true;
 
-                               if (iface->metric)
+                               if (iface->metric || a_new->policy_table)
                                        interface_handle_subnet_route(iface, a_new, true);
                        }
 
                        if (!keep) {
-                               if ((a_new->flags & DEVADDR_FAMILY) == DEVADDR_INET6)
-                                       v6 = true;
-
-                               unsigned int table = (v6) ? iface->ip6table : iface->ip4table;
-
-                               if (table) {
+                               if (a_new->policy_table)
                                        set_ip_source_policy(true, v6, IPRULE_PRIORITY_ADDR, &a_new->addr,
-                                                       (v6) ? 128 : 32, 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);
-                               }
+                                                       (v6) ? 128 : 32, a_new->policy_table, NULL, NULL);
                        }
                }
        }
@@ -1213,6 +1223,8 @@ void interface_ip_set_enabled(struct interface_ip_settings *ip, bool enabled)
                return;
 
        vlist_for_each_element(&ip->addr, addr, node) {
+               bool v6 = ((addr->flags & DEVADDR_FAMILY) == DEVADDR_INET6) ? true : false;
+
                if (addr->enabled == enabled)
                        continue;
 
@@ -1220,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);
+
+                       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);
+
+                       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;
        }
@@ -1263,9 +1284,13 @@ 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)
+       if (ip->iface && ip->iface->l3_dev.dev) {
+               set_ip_lo_policy(enabled, true, ip->iface);
+               set_ip_lo_policy(enabled, false, ip->iface);
+
                set_ip_source_policy(enabled, true, IPRULE_PRIORITY_REJECT + ip->iface->l3_dev.dev->ifindex,
                        NULL, 0, 0, ip->iface, "failed_policy");
+       }
 }
 
 void