X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface-ip.c;h=3bd92cf49198c22b0d1b845e5f31b44c082f1a64;hp=3771b5d99b1093d2b7d6c68f38bba60295ce385f;hb=700effdec6e66e4a93c88613f2da1d3d8c141fcb;hpb=4106d0ced43327848791ed6182f28d461c01a4b8

diff --git a/interface-ip.c b/interface-ip.c
index 3771b5d..3bd92cf 100644
--- a/interface-ip.c
+++ b/interface-ip.c
@@ -337,12 +337,12 @@ 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);
+		route->sourcemask = (mask) ? atoi(mask) : ((af == AF_INET6) ? 128 : 32);
 	}
 
 	if (is_proto_route) {
@@ -457,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);
 
@@ -496,15 +499,18 @@ 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);
 		}
@@ -521,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)
@@ -559,6 +567,9 @@ 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);
 
@@ -637,10 +648,12 @@ interface_set_prefix_address(struct device_prefix_assignment *assignment,
 		addr.preferred_until = now;
 		if (!addr.valid_until || addr.valid_until - now > 7200)
 			addr.valid_until = now + 7200;
+		system_del_address(l3_downlink, &addr); // Work around dangling prefix routes
 		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");
@@ -653,8 +666,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(
@@ -829,6 +843,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;