X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface-ip.c;h=62d15fd7477e07fa38a401c2c28cf033d22c404b;hp=587826a996cd708d094b00fc658fcaf3a4919dbc;hb=e80de45c859b1bc1b5e5f63199ea74c210ff8198;hpb=4452867c4b34cb0d9dc7fe9dc42ecc86af887176

diff --git a/interface-ip.c b/interface-ip.c
index 587826a..62d15fd 100644
--- a/interface-ip.c
+++ b/interface-ip.c
@@ -75,8 +75,8 @@ clear_if_addr(union if_addr *a, int mask)
 	uint8_t m_clear = (1 << (m_bytes * 8 - mask)) - 1;
 	uint8_t *p = (uint8_t *) a;
 
-	if (m_bytes < sizeof(a))
-		memset(p + m_bytes, 0, sizeof(a) - m_bytes);
+	if (m_bytes < sizeof(*a))
+		memset(p + m_bytes, 0, sizeof(*a) - m_bytes);
 
 	p[m_bytes - 1] &= ~m_clear;
 }
@@ -601,7 +601,7 @@ interface_update_proto_route(struct vlist_tree *tree,
 	if (node_old && node_new)
 		keep = !memcmp(&route_old->nexthop, &route_new->nexthop, sizeof(route_old->nexthop)) &&
 			(route_old->mtu == route_new->mtu) && (route_old->type == route_new->type) &&
-			!route_old->failed;
+			(route_old->valid_until == route_new->valid_until) && !route_old->failed;
 
 	if (node_old) {
 		if (!(route_old->flags & DEVADDR_EXTERNAL) && route_old->enabled && !keep)
@@ -669,13 +669,20 @@ interface_set_prefix_address(struct device_prefix_assignment *assignment,
 	addr.preferred_until = prefix->preferred_until;
 	addr.valid_until = prefix->valid_until;
 
+	if (addr.mask < 64) {
+		addr.mask = 64;
+		system_del_address(l3_downlink, &addr);
+		addr.mask = assignment->length;
+	}
+
 	if (!add && assignment->enabled) {
 		time_t now = system_get_rtime();
 		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) {
 			if (prefix->iface->ip6table)
 				set_ip_source_policy(false, true, IPRULE_PRIORITY_NW, &addr.addr,
@@ -685,9 +692,17 @@ interface_set_prefix_address(struct device_prefix_assignment *assignment,
 							addr.mask, 0, iface, "unreachable");
 		}
 
+		if (addr.mask < 64)
+			addr.mask = 64;
+
+		interface_handle_subnet_route(iface, &addr, false);
+		system_add_address(l3_downlink, &addr);
+
 		assignment->enabled = false;
 	} else if (add && (iface->state == IFS_UP || iface->state == IFS_SETUP) &&
 			!system_add_address(l3_downlink, &addr)) {
+		interface_handle_subnet_route(iface, &addr, false);
+
 		if (prefix->iface && !assignment->enabled) {
 			set_ip_source_policy(true, true, IPRULE_PRIORITY_REJECT, &addr.addr,
 					addr.mask, 0, iface, "unreachable");
@@ -696,12 +711,19 @@ interface_set_prefix_address(struct device_prefix_assignment *assignment,
 				set_ip_source_policy(true, true, IPRULE_PRIORITY_NW, &addr.addr,
 						addr.mask, prefix->iface->ip6table, iface, NULL);
 		}
+
+		if (addr.mask < 64)
+			addr.mask = 64;
+
+		interface_handle_subnet_route(iface, &addr, true);
+
 		if (uplink && uplink->l3_dev.dev) {
 			int mtu = system_update_ipv6_mtu(
 					uplink->l3_dev.dev, 0);
 			if (mtu > 0)
 				system_update_ipv6_mtu(l3_downlink, mtu);
 		}
+
 		assignment->enabled = true;
 	}
 }