X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface-ip.c;h=220f4a01a25ae0702fe0142b972fe647926632a1;hp=a1775572e6064b28b509dc85f0639347a339ac89;hb=ebd3d8417c7a08c03de2d38e8f43422428dd4094;hpb=e5faaa6aa420a4d144cd13350de971b6d855b231

diff --git a/interface-ip.c b/interface-ip.c
index a177557..220f4a0 100644
--- 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);
@@ -514,15 +535,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);
@@ -545,19 +561,14 @@ interface_update_proto_addr(struct vlist_tree *tree,
 				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->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 +1234,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 +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