interface-ip: Remove table specific nw rules for IPv4/6 addresses

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

diff --git a/interface-ip.c b/interface-ip.c
index a177557..c4514b0 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)
 {
@@ -514,15 +531,10 @@ interface_update_proto_addr(struct vlist_tree *tree,
                        //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 (a_old->policy_table) {
+                       if (a_old->policy_table)
                                set_ip_source_policy(false, v6, IPRULE_PRIORITY_ADDR, &a_old->addr,
                                                (v6) ? 128 : 32, a_old->policy_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, a_old->policy_table, NULL, NULL);
-                       }
-
                        if (!(a_old->flags & DEVADDR_EXTERNAL)) {
                                interface_handle_subnet_route(iface, a_old, false);
                                system_del_address(dev, a_old);
@@ -550,14 +562,9 @@ interface_update_proto_addr(struct vlist_tree *tree,
                        }
 
                        if (!keep) {
-                               if (a_new->policy_table) {
+                               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);
-
-                                       if (a_new->mask != ((v6) ? 128 : 32))
-                                               set_ip_source_policy(true, v6, IPRULE_PRIORITY_NW, &a_new->addr,
-                                                               a_new->mask, a_new->policy_table, NULL, NULL);
-                               }
                        }
                }
        }
@@ -1223,26 +1230,16 @@ void interface_ip_set_enabled(struct interface_ip_settings *ip, bool enabled)
                                interface_handle_subnet_route(iface, addr, true);
 
                        addr->policy_table = (v6) ? iface->ip6table : iface->ip4table;
-                       if (addr->policy_table) {
+                       if (addr->policy_table)
                                set_ip_source_policy(true, v6, IPRULE_PRIORITY_ADDR, &addr->addr,
                                                (v6) ? 128 : 32, addr->policy_table, NULL, NULL);
-
-                                       if (addr->mask != ((v6) ? 128 : 32))
-                                               set_ip_source_policy(true, v6, IPRULE_PRIORITY_NW, &addr->addr,
-                                                               addr->mask, addr->policy_table, NULL, NULL);
-                       }
                } else {
                        interface_handle_subnet_route(iface, addr, false);
                        system_del_address(dev, addr);
 
-                       if (addr->policy_table) {
+                       if (addr->policy_table)
                                set_ip_source_policy(false, v6, IPRULE_PRIORITY_ADDR, &addr->addr,
                                                (v6) ? 128 : 32, addr->policy_table, NULL, NULL);
-
-                               if (addr->mask != ((v6) ? 128 : 32))
-                                       set_ip_source_policy(false, v6, IPRULE_PRIORITY_NW, &addr->addr,
-                                                       addr->mask, addr->policy_table, NULL, NULL);
-                       }
                }
                addr->enabled = enabled;
        }
@@ -1283,9 +1280,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