X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface-ip.c;h=fed7d725c7c37b7b9742aa3300c81c3729747966;hp=084688c61c8e1921401784d44f3a948d5893b124;hb=b8c54175393d6cfd07ea641230bd785ce9aee0cc;hpb=f80b9e4acc47cf454768b44142495fdb8a68a39f

diff --git a/interface-ip.c b/interface-ip.c
index 084688c..fed7d72 100644
--- a/interface-ip.c
+++ b/interface-ip.c
@@ -59,7 +59,6 @@ const struct uci_blob_param_list route_attr_list = {
 
 
 struct list_head prefixes = LIST_HEAD_INIT(prefixes);
-static struct list_head source_tables = LIST_HEAD_INIT(source_tables);
 static struct device_prefix *ula_prefix = NULL;
 static struct uloop_timeout valid_until_timeout;
 
@@ -197,72 +196,6 @@ __find_ip_route_target(struct interface_ip_settings *ip, union if_addr *a,
 	}
 }
 
-static struct device_source_table*
-find_source_table(const struct device_route *route)
-{
-	struct device_source_table key = {
-		.v6 = (route->flags & DEVADDR_FAMILY) == DEVADDR_INET6,
-		.addr = route->source,
-		.mask = route->sourcemask
-	};
-	struct device_source_table *c;
-	list_for_each_entry(c, &source_tables, head)
-		if (!memcmp(&c->v6, &key.v6, sizeof(key) -
-				offsetof(struct device_source_table, v6)))
-			return c;
-	return NULL;
-}
-
-static uint32_t
-get_source_table(const struct device_route *route)
-{
-	if (route->table || route->sourcemask == 0)
-		return route->table;
-
-	struct device_source_table *tbl = find_source_table(route);
-
-	if (!tbl) {
-		tbl = calloc(1, sizeof(*tbl));
-		tbl->addr = route->source;
-		tbl->mask = route->sourcemask;
-		tbl->v6 = (route->flags & DEVADDR_FAMILY) == DEVADDR_INET6;
-		tbl->table = IPRULE_PRIORITY_SOURCE | (((~tbl->mask) & 0x7f) << 20);
-
-		struct list_head *before = NULL;
-		struct device_source_table *c;
-		list_for_each_entry(c, &source_tables, head) {
-			if (c->table > tbl->table) {
-				before = &c->head;
-				break;
-			} else if (c->table == tbl->table) {
-				++tbl->table;
-			}
-		}
-
-		if (!before)
-			before = &source_tables;
-
-		list_add_tail(&tbl->head, before);
-		set_ip_source_policy(true, tbl->v6, tbl->table, &tbl->addr,
-				tbl->mask, tbl->table, NULL, NULL);
-	}
-
-	++tbl->refcount;
-	return tbl->table;
-}
-
-static void
-put_source_table(const struct device_route *route)
-{
-	struct device_source_table *tbl = find_source_table(route);
-	if (tbl && tbl->table == route->table && --tbl->refcount == 0) {
-		set_ip_source_policy(false, tbl->v6, tbl->table, &tbl->addr,
-				tbl->mask, tbl->table, NULL, NULL);
-		list_del(&tbl->head);
-		free(tbl);
-	}
-}
-
 static bool
 interface_ip_find_addr_target(struct interface *iface, union if_addr *a, bool v6)
 {
@@ -404,13 +337,15 @@ interface_ip_add_route(struct interface *iface, struct blob_attr *attr, bool v6)
 		const char *addr = strtok_r(source, "/", &saveptr);
 		const char *mask = strtok_r(NULL, "/", &saveptr);
 
-		if (inet_pton(af, addr, &route->source) < 1) {
+		if (!addr || inet_pton(af, addr, &route->source) < 1) {
 			DPRINTF("Failed to parse route source: %s\n", addr);
 			goto error;
 		}
 
-		route->sourcemask = atoi(mask);
-	} else if (is_proto_route) {
+		route->sourcemask = (mask) ? atoi(mask) : ((af == AF_INET6) ? 128 : 32);
+	}
+
+	if (is_proto_route) {
 		route->table = (v6) ? iface->ip6table : iface->ip4table;
 		route->flags |= DEVROUTE_SRCTABLE;
 	}
@@ -432,11 +367,6 @@ interface_ip_add_route(struct interface *iface, struct blob_attr *attr, bool v6)
 			route->valid_until = valid_until;
 	}
 
-	if (route->sourcemask) {
-		route->table = get_source_table(route);
-		route->flags |= DEVROUTE_SRCTABLE;
-	}
-
 	vlist_add(&ip->route, &route->node, route);
 	return;
 
@@ -527,6 +457,9 @@ interface_update_proto_addr(struct vlist_tree *tree,
 	iface = ip->iface;
 	dev = iface->l3_dev.dev;
 
+	if (!node_new || !node_old)
+		iface->updated |= IUF_ADDRESS;
+
 	if (node_new) {
 		a_new = container_of(node_new, struct device_addr, node);
 
@@ -566,18 +499,22 @@ 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).
-			set_ip_source_policy(false, v6, IPRULE_PRIORITY_ADDR, &a_old->addr,
-				(v6) ? 128 : 32, (v6) ? iface->ip6table : iface->ip4table,
-						NULL, NULL);
-			set_ip_source_policy(false, v6, IPRULE_PRIORITY_NW, &a_old->addr,
-				a_old->mask, (v6) ? iface->ip6table : iface->ip4table, NULL, NULL);
+			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);
+			}
 
 			system_del_address(dev, a_old);
 		}
+		free(a_old->pclass);
 		free(a_old);
 	}
 
@@ -590,12 +527,14 @@ interface_update_proto_addr(struct vlist_tree *tree,
 				if ((a_new->flags & DEVADDR_FAMILY) == DEVADDR_INET6)
 					v6 = true;
 
-				set_ip_source_policy(true, v6, IPRULE_PRIORITY_ADDR, &a_new->addr,
-					(v6) ? 128 : 32, (v6) ? iface->ip6table : iface->ip4table,
-							NULL, NULL);
-				set_ip_source_policy(true, v6, IPRULE_PRIORITY_NW, &a_new->addr,
-					a_new->mask, (v6) ? iface->ip6table : iface->ip4table,
-							NULL, NULL);
+				unsigned int 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 ((a_new->flags & DEVADDR_OFFLINK) || iface->metric)
@@ -628,17 +567,20 @@ interface_update_proto_route(struct vlist_tree *tree,
 	iface = ip->iface;
 	dev = iface->l3_dev.dev;
 
+	if (!node_new || !node_old)
+		iface->updated |= IUF_ROUTE;
+
 	route_old = container_of(node_old, struct device_route, node);
 	route_new = container_of(node_new, struct device_route, node);
 
 	if (node_old && node_new)
-		keep = !memcmp(&route_old->nexthop, &route_new->nexthop, sizeof(route_old->nexthop));
+		keep = !memcmp(&route_old->nexthop, &route_new->nexthop, sizeof(route_old->nexthop)) &&
+			(route_old->table == route_new->table);
 
 	if (node_old) {
 		if (!(route_old->flags & DEVADDR_EXTERNAL) && route_old->enabled && !keep)
 			system_del_route(dev, route_old);
 
-		put_source_table(route_old);
 		free(route_old);
 	}
 
@@ -708,8 +650,9 @@ interface_set_prefix_address(struct device_prefix_assignment *assignment,
 			addr.valid_until = now + 7200;
 		system_add_address(l3_downlink, &addr);
 		if (prefix->iface) {
-			set_ip_source_policy(false, true, IPRULE_PRIORITY_NW, &addr.addr,
-					addr.mask, prefix->iface->ip6table, iface, NULL);
+			if (prefix->iface->ip6table)
+				set_ip_source_policy(false, true, IPRULE_PRIORITY_NW, &addr.addr,
+						addr.mask, prefix->iface->ip6table, iface, NULL);
 
 			set_ip_source_policy(false, true, IPRULE_PRIORITY_REJECT, &addr.addr,
 							addr.mask, 0, iface, "unreachable");
@@ -722,8 +665,9 @@ interface_set_prefix_address(struct device_prefix_assignment *assignment,
 			set_ip_source_policy(true, true, IPRULE_PRIORITY_REJECT, &addr.addr,
 					addr.mask, 0, iface, "unreachable");
 
-			set_ip_source_policy(true, true, IPRULE_PRIORITY_NW, &addr.addr,
-					addr.mask, prefix->iface->ip6table, iface, NULL);
+			if (prefix->iface->ip6table)
+				set_ip_source_policy(true, true, IPRULE_PRIORITY_NW, &addr.addr,
+						addr.mask, prefix->iface->ip6table, iface, NULL);
 		}
 		if (uplink && uplink->l3_dev.dev) {
 			int mtu = system_update_ipv6_mtu(
@@ -898,6 +842,10 @@ interface_update_prefix(struct vlist_tree *tree,
 	prefix_old = container_of(node_old, struct device_prefix, node);
 	prefix_new = container_of(node_new, struct device_prefix, node);
 
+	struct interface_ip_settings *ip = container_of(tree, struct interface_ip_settings, prefix);
+	if (tree && (!node_new || !node_old))
+		ip->iface->updated |= IUF_PREFIX;
+
 	struct device_route route;
 	memset(&route, 0, sizeof(route));
 	route.flags = DEVADDR_INET6;