X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface-ip.c;h=919c8cc83f9bf7a830e6540807ecbf1b8df93139;hp=18dd2fa72027ddfccb4c8b6bc3be5f7b999a582f;hb=b998775b925330725e547af8d33394db0d638f7a;hpb=8faa5b30b12ee3e4d06a8d2557d1f112f1f2786e

diff --git a/interface-ip.c b/interface-ip.c
index 18dd2fa..919c8cc 100644
--- a/interface-ip.c
+++ b/interface-ip.c
@@ -99,7 +99,7 @@ match_if_addr(union if_addr *a1, union if_addr *a2, int mask)
 
 static int set_ip_source_policy(bool add, bool v6, unsigned int priority,
 		const union if_addr *addr, uint8_t mask, unsigned int table,
-		struct interface *in_iface, const char *action)
+		struct interface *in_iface, const char *action, bool src)
 {
 	struct iprule rule = {
 		.flags = IPRULE_PRIORITY,
@@ -107,9 +107,15 @@ static int set_ip_source_policy(bool add, bool v6, unsigned int priority,
 	};
 
 	if (addr) {
-		rule.flags |= IPRULE_SRC;
-		rule.src_addr = *addr;
-		rule.src_mask = mask;
+		if (src) {
+			rule.flags |= IPRULE_SRC;
+			rule.src_addr = *addr;
+			rule.src_mask = mask;
+		} else {
+			rule.flags |= IPRULE_DEST;
+			rule.dest_addr = *addr;
+			rule.dest_mask = mask;
+		}
 	}
 
 	if (table) {
@@ -274,6 +280,24 @@ done:
 	return iface;
 }
 
+static void
+interface_set_route_info(struct interface *iface, struct device_route *route)
+{
+	bool v6 = ((route->flags & DEVADDR_FAMILY) == DEVADDR_INET6);
+
+	if (!iface)
+		return;
+
+	if (!(route->flags & DEVROUTE_METRIC))
+		route->metric = iface->metric;
+
+	if (!(route->flags & DEVROUTE_TABLE)) {
+		route->table = (v6) ? iface->ip6table : iface->ip4table;
+		if (route->table)
+			route->flags |= DEVROUTE_SRCTABLE;
+	}
+}
+
 void
 interface_ip_add_route(struct interface *iface, struct blob_attr *attr, bool v6)
 {
@@ -281,7 +305,6 @@ interface_ip_add_route(struct interface *iface, struct blob_attr *attr, bool v6)
 	struct blob_attr *tb[__ROUTE_MAX], *cur;
 	struct device_route *route;
 	int af = v6 ? AF_INET6 : AF_INET;
-	bool is_proto_route = !!iface;
 
 	blobmsg_parse(route_attr, __ROUTE_MAX, tb, blobmsg_data(attr), blobmsg_data_len(attr));
 
@@ -327,8 +350,7 @@ interface_ip_add_route(struct interface *iface, struct blob_attr *attr, bool v6)
 	if ((cur = tb[ROUTE_METRIC]) != NULL) {
 		route->metric = blobmsg_get_u32(cur);
 		route->flags |= DEVROUTE_METRIC;
-	} else
-		route->metric = iface->metric;
+	}
 
 	if ((cur = tb[ROUTE_MTU]) != NULL) {
 		route->mtu = blobmsg_get_u32(cur);
@@ -354,11 +376,6 @@ interface_ip_add_route(struct interface *iface, struct blob_attr *attr, bool v6)
 	if ((cur = tb[ROUTE_ONLINK]) != NULL && blobmsg_get_bool(cur))
 		route->flags |= DEVROUTE_ONLINK;
 
-	if (is_proto_route) {
-		route->table = (v6) ? iface->ip6table : iface->ip4table;
-		route->flags |= DEVROUTE_SRCTABLE;
-	}
-
 	if ((cur = tb[ROUTE_TABLE]) != NULL) {
 		if (!system_resolve_rt_table(blobmsg_data(cur), &route->table)) {
 			DPRINTF("Failed to resolve routing table: %s\n", (char *) blobmsg_data(cur));
@@ -388,6 +405,7 @@ interface_ip_add_route(struct interface *iface, struct blob_attr *attr, bool v6)
 		route->flags |= DEVROUTE_TYPE;
 	}
 
+	interface_set_route_info(iface, route);
 	vlist_add(&ip->route, &route->node, route);
 	return;
 
@@ -440,28 +458,46 @@ static void
 interface_handle_subnet_route(struct interface *iface, struct device_addr *addr, bool add)
 {
 	struct device *dev = iface->l3_dev.dev;
-	struct device_route route;
+	struct device_route *r = &addr->subnet;
 
 	if (addr->flags & DEVADDR_OFFLINK)
 		return;
 
-	memset(&route, 0, sizeof(route));
-	route.iface = iface;
-	route.flags = addr->flags;
-	route.mask = addr->mask;
-	memcpy(&route.addr, &addr->addr, sizeof(route.addr));
-	clear_if_addr(&route.addr, route.mask);
-
-	if (add) {
-		route.flags |= DEVADDR_KERNEL;
-		system_del_route(dev, &route);
+	if (!add) {
+		if (!addr->subnet.iface)
+			return;
 
-		route.flags &= ~DEVADDR_KERNEL;
-		route.metric = iface->metric;
-		system_add_route(dev, &route);
-	} else {
-		system_del_route(dev, &route);
+		system_del_route(dev, r);
+		memset(r, 0, sizeof(*r));
+		return;
 	}
+
+	r->iface = iface;
+	r->flags = addr->flags;
+	r->mask = addr->mask;
+	memcpy(&r->addr, &addr->addr, sizeof(r->addr));
+	clear_if_addr(&r->addr, r->mask);
+
+	r->flags |= DEVADDR_KERNEL;
+	system_del_route(dev, r);
+
+	r->flags &= ~DEVADDR_KERNEL;
+	interface_set_route_info(iface, r);
+
+	system_add_route(dev, r);
+}
+
+static void
+interface_add_addr_rules(struct device_addr *addr, bool enabled)
+{
+	bool v6 = (addr->flags & DEVADDR_FAMILY) == DEVADDR_INET6;
+
+	set_ip_source_policy(enabled, v6, IPRULE_PRIORITY_ADDR, &addr->addr,
+			     (v6) ? 128 : 32, addr->policy_table, NULL, NULL,
+			     true);
+	set_ip_source_policy(enabled, v6, IPRULE_PRIORITY_ADDR_MASK,
+			     &addr->addr, addr->mask, addr->policy_table, NULL,
+			     NULL, false);
 }
 
 static void
@@ -490,11 +526,17 @@ interface_update_proto_addr(struct vlist_tree *tree,
 		if ((a_new->flags & DEVADDR_FAMILY) == DEVADDR_INET4 &&
 		    !a_new->broadcast) {
 
-			uint32_t mask = ~0;
-			uint32_t *a = (uint32_t *) &a_new->addr;
+			/* /31 and /32 addressing need 255.255.255.255
+			 * as broadcast address. */
+			if (a_new->mask >= 31) {
+				a_new->broadcast = (uint32_t) ~0;
+			} else {
+				uint32_t mask = ~0;
+				uint32_t *a = (uint32_t *) &a_new->addr;
 
-			mask >>= a_new->mask;
-			a_new->broadcast = *a | htonl(mask);
+				mask >>= a_new->mask;
+				a_new->broadcast = *a | htonl(mask);
+			}
 		}
 	}
 
@@ -517,26 +559,18 @@ interface_update_proto_addr(struct vlist_tree *tree,
 	}
 
 	if (node_old) {
-		if (!(a_old->flags & DEVADDR_EXTERNAL) && a_old->enabled && !keep) {
-			interface_handle_subnet_route(iface, a_old, false);
-
-			if ((a_old->flags & DEVADDR_FAMILY) == DEVADDR_INET6)
-				v6 = true;
-
-			unsigned int table = (v6) ? iface->ip6table : iface->ip4table;
-
+		if (a_old->enabled && !keep) {
 			//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).
-			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);
-			}
+			if (a_old->policy_table)
+				interface_add_addr_rules(a_old, false);
 
-			system_del_address(dev, a_old);
+			if (!(a_old->flags & DEVADDR_EXTERNAL)) {
+				interface_handle_subnet_route(iface, a_old, false);
+				system_del_address(dev, a_old);
+			}
 		}
 		free(a_old->pclass);
 		free(a_old);
@@ -544,26 +578,25 @@ interface_update_proto_addr(struct vlist_tree *tree,
 
 	if (node_new) {
 		a_new->enabled = true;
-		if (!(a_new->flags & DEVADDR_EXTERNAL) && (!keep || replace)) {
-			if (system_add_address(dev, a_new))
-				a_new->failed = true;
 
-			if (!keep) {
-				if ((a_new->flags & DEVADDR_FAMILY) == DEVADDR_INET6)
-					v6 = true;
+		if ((a_new->flags & DEVADDR_FAMILY) == DEVADDR_INET6)
+				v6 = true;
 
-				unsigned int table = (v6) ? iface->ip6table : iface->ip4table;
+		a_new->policy_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 (!keep || replace) {
+			if (!(a_new->flags & DEVADDR_EXTERNAL)) {
+				if (system_add_address(dev, a_new))
+					a_new->failed = true;
+
+				if (iface->metric || a_new->policy_table)
+					interface_handle_subnet_route(iface, a_new, true);
 			}
 
-			if (iface->metric)
-				interface_handle_subnet_route(iface, a_new, true);
+			if (!keep) {
+				if (a_new->policy_table)
+					interface_add_addr_rules(a_new, true);
+			}
 		}
 	}
 }
@@ -601,7 +634,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->valid_until == route_new->valid_until) && !route_old->failed;
+			!route_old->failed;
 
 	if (node_old) {
 		if (!(route_old->flags & DEVADDR_EXTERNAL) && route_old->enabled && !keep)
@@ -710,7 +743,9 @@ interface_set_prefix_address(struct device_prefix_assignment *assignment,
 	struct device *l3_downlink = iface->l3_dev.dev;
 
 	struct device_addr addr;
+	struct device_route route;
 	memset(&addr, 0, sizeof(addr));
+	memset(&route, 0, sizeof(route));
 
 	if (IN6_IS_ADDR_UNSPECIFIED(&assignment->addr)) {
 		addr.addr.in6 = prefix->addr;
@@ -722,15 +757,15 @@ interface_set_prefix_address(struct device_prefix_assignment *assignment,
 		addr.addr.in6 = assignment->addr;
 
 	addr.mask = assignment->length;
-	addr.flags = DEVADDR_INET6;
+	addr.flags = DEVADDR_INET6 | DEVADDR_OFFLINK;
 	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;
-	}
+	route.flags = DEVADDR_INET6;
+	route.mask = addr.mask < 64 ? 64 : addr.mask;
+	route.addr = addr.addr;
+	clear_if_addr(&route.addr, route.mask);
+	interface_set_route_info(iface, &route);
 
 	if (!add && assignment->enabled) {
 		time_t now = system_get_rtime();
@@ -738,46 +773,39 @@ interface_set_prefix_address(struct device_prefix_assignment *assignment,
 		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
-
 		if (prefix->iface) {
 			if (prefix->iface->ip6table)
 				set_ip_source_policy(false, true, IPRULE_PRIORITY_NW, &addr.addr,
-						addr.mask, prefix->iface->ip6table, iface, NULL);
+						addr.mask, prefix->iface->ip6table, iface, NULL, true);
 
 			set_ip_source_policy(false, true, IPRULE_PRIORITY_REJECT, &addr.addr,
-							addr.mask, 0, iface, "unreachable");
+							addr.mask, 0, iface, "unreachable", true);
 		}
 
-		if (addr.mask < 64)
-			addr.mask = 64;
-
-		interface_handle_subnet_route(iface, &addr, false);
+		system_del_route(l3_downlink, &route);
 		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");
+					addr.mask, 0, iface, "unreachable", true);
 
 			if (prefix->iface->ip6table)
 				set_ip_source_policy(true, true, IPRULE_PRIORITY_NW, &addr.addr,
-						addr.mask, prefix->iface->ip6table, iface, NULL);
+						addr.mask, prefix->iface->ip6table, iface, NULL, true);
 		}
 
-		if (addr.mask < 64)
-			addr.mask = 64;
+		route.metric = iface->metric;
+		system_add_route(l3_downlink, &route);
 
-		interface_handle_subnet_route(iface, &addr, true);
+		if (uplink && uplink->l3_dev.dev && !(l3_downlink->settings.flags & DEV_OPT_MTU6)) {
+			int mtu = system_update_ipv6_mtu(uplink->l3_dev.dev, 0);
+			int mtu_old = system_update_ipv6_mtu(l3_downlink, 0);
 
-		if (uplink && uplink->l3_dev.dev) {
-			int mtu = system_update_ipv6_mtu(
-					uplink->l3_dev.dev, 0);
-			if (mtu > 0)
+			if (mtu > 0 && mtu_old > mtu)
 				system_update_ipv6_mtu(l3_downlink, mtu);
 		}
 
@@ -1223,16 +1251,26 @@ void interface_ip_set_enabled(struct interface_ip_settings *ip, bool enabled)
 		return;
 
 	vlist_for_each_element(&ip->addr, addr, node) {
+		bool v6 = ((addr->flags & DEVADDR_FAMILY) == DEVADDR_INET6) ? true : false;
+
 		if (addr->enabled == enabled)
 			continue;
 
 		if (enabled) {
 			system_add_address(dev, addr);
-			if (iface->metric)
+
+			addr->policy_table = (v6) ? iface->ip6table : iface->ip4table;
+			if (iface->metric || addr->policy_table)
 				interface_handle_subnet_route(iface, addr, true);
+
+			if (addr->policy_table)
+				interface_add_addr_rules(addr, true);
 		} else {
 			interface_handle_subnet_route(iface, addr, false);
 			system_del_address(dev, addr);
+
+			if (addr->policy_table)
+				interface_add_addr_rules(addr, false);
 		}
 		addr->enabled = enabled;
 	}
@@ -1247,8 +1285,7 @@ void interface_ip_set_enabled(struct interface_ip_settings *ip, bool enabled)
 			continue;
 
 		if (_enabled) {
-			if (!(route->flags & DEVROUTE_METRIC))
-				route->metric = ip->iface->metric;
+			interface_set_route_info(ip->iface, route);
 
 			if (system_add_route(dev, route))
 				route->failed = true;
@@ -1264,12 +1301,14 @@ 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->policy_rules_set != enabled &&
+	    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");
+			NULL, 0, 0, ip->iface, "failed_policy", true);
+		ip->iface->policy_rules_set = enabled;
 	}
 }