X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface-ip.c;h=ed68116662f084942d0f27ebe42174cb3dce0468;hp=9bdad4fd32ca9b31015b5d1c491acd0cfb6643c9;hb=23bb091077348d3b87b9900ae3ff923cdd25a662;hpb=c6b739e28f2b15789c95dd28af3f193ec8f67531

diff --git a/interface-ip.c b/interface-ip.c
index 9bdad4f..ed68116 100644
--- a/interface-ip.c
+++ b/interface-ip.c
@@ -18,7 +18,6 @@ enum {
 	ROUTE_TARGET,
 	ROUTE_MASK,
 	ROUTE_GATEWAY,
-	ROUTE_DEVICE,
 	ROUTE_METRIC,
 	ROUTE_MTU,
 	__ROUTE_MAX
@@ -29,7 +28,6 @@ static const struct blobmsg_policy route_attr[__ROUTE_MAX] = {
 	[ROUTE_TARGET] = { .name = "target", .type = BLOBMSG_TYPE_STRING },
 	[ROUTE_MASK] = { .name = "netmask", .type = BLOBMSG_TYPE_STRING },
 	[ROUTE_GATEWAY] = { .name = "gateway", .type = BLOBMSG_TYPE_STRING },
-	[ROUTE_DEVICE] = { .name = "device", .type = BLOBMSG_TYPE_STRING },
 	[ROUTE_METRIC] = { .name = "metric", .type = BLOBMSG_TYPE_INT32 },
 	[ROUTE_MTU] = { .name = "mtu", .type = BLOBMSG_TYPE_INT32 },
 };
@@ -39,6 +37,120 @@ const struct config_param_list route_attr_list = {
 	.params = route_attr,
 };
 
+static bool
+match_if_addr(union if_addr *a1, union if_addr *a2, int mask)
+{
+	uint8_t *p1, *p2;
+	int m_bytes = (mask + 7) / 8;
+	uint8_t m_clear = (1 << (m_bytes * 8 - mask)) - 1;
+
+	p1 = alloca(m_bytes);
+	p2 = alloca(m_bytes);
+
+	memcpy(p1, a1, m_bytes);
+	memcpy(p2, a2, m_bytes);
+
+	p1[m_bytes - 1] &= ~m_clear;
+	p2[m_bytes - 1] &= ~m_clear;
+
+	return !memcmp(p1, p2, m_bytes);
+}
+
+static bool
+__find_ip_addr_target(struct interface_ip_settings *ip, union if_addr *a, bool v6)
+{
+	struct device_addr *addr;
+
+	vlist_for_each_element(&ip->addr, addr, node) {
+		if (!addr->enabled)
+			continue;
+
+		if (v6 != ((addr->flags & DEVADDR_FAMILY) == DEVADDR_INET6))
+			continue;
+
+		if (!match_if_addr(&addr->addr, a, addr->mask))
+			continue;
+
+		return true;
+	}
+
+	return false;
+}
+
+static void
+__find_ip_route_target(struct interface_ip_settings *ip, union if_addr *a,
+		       bool v6, struct device_route **res)
+{
+	struct device_route *route;
+
+	vlist_for_each_element(&ip->route, route, node) {
+		if (!route->enabled)
+			continue;
+
+		if (v6 != ((route->flags & DEVADDR_FAMILY) == DEVADDR_INET6))
+			continue;
+
+		if (!match_if_addr(&route->addr, a, route->mask))
+			continue;
+
+		if (!*res || route->mask < (*res)->mask)
+			*res = route;
+	}
+}
+
+static bool
+interface_ip_find_addr_target(struct interface *iface, union if_addr *a, bool v6)
+{
+	return __find_ip_addr_target(&iface->proto_ip, a, v6) ||
+	       __find_ip_addr_target(&iface->config_ip, a, v6);
+}
+
+static void
+interface_ip_find_route_target(struct interface *iface, union if_addr *a,
+			       bool v6, struct device_route **route)
+{
+	__find_ip_route_target(&iface->proto_ip, a, v6, route);
+	__find_ip_route_target(&iface->config_ip, a, v6, route);
+}
+
+struct interface *
+interface_ip_add_target_route(union if_addr *addr, bool v6)
+{
+	struct interface *iface;
+	struct device_route *route, *r_next = NULL;
+
+	route = calloc(1, sizeof(*route));
+	if (!route)
+		return false;
+
+	route->flags = v6 ? DEVADDR_INET6 : DEVADDR_INET4;
+	route->mask = v6 ? 128 : 32;
+	memcpy(&route->addr, addr, v6 ? sizeof(addr->in6) : sizeof(addr->in));
+
+	vlist_for_each_element(&interfaces, iface, node) {
+		/* look for locally addressable target first */
+		if (interface_ip_find_addr_target(iface, addr, v6))
+			goto done;
+
+		/* do not stop at the first route, let the lookup compare
+		 * masks to find the best match */
+		interface_ip_find_route_target(iface, addr, v6, &r_next);
+	}
+
+	if (!r_next)
+		return NULL;
+
+	iface = r_next->iface;
+	memcpy(&route->nexthop, &r_next->nexthop, sizeof(route->nexthop));
+	route->mtu = r_next->mtu;
+	route->metric = r_next->metric;
+
+done:
+	route->iface = iface;
+	vlist_add(&iface->host_routes, &route->node, &route->flags);
+	return iface;
+}
+
 void
 interface_ip_add_route(struct interface *iface, struct blob_attr *attr, bool v6)
 {
@@ -46,13 +158,9 @@ 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 config = false;
 
 	blobmsg_parse(route_attr, __ROUTE_MAX, tb, blobmsg_data(attr), blobmsg_data_len(attr));
 
-	if (!tb[ROUTE_GATEWAY] && !tb[ROUTE_DEVICE])
-		return;
-
 	if (!iface) {
 		if ((cur = tb[ROUTE_INTERFACE]) == NULL)
 			return;
@@ -62,7 +170,6 @@ interface_ip_add_route(struct interface *iface, struct blob_attr *attr, bool v6)
 			return;
 
 		ip = &iface->config_ip;
-		config = true;
 	} else {
 		ip = &iface->proto_ip;
 	}
@@ -71,6 +178,7 @@ interface_ip_add_route(struct interface *iface, struct blob_attr *attr, bool v6)
 	if (!route)
 		return;
 
+	route->flags = v6 ? DEVADDR_INET6 : DEVADDR_INET4;
 	route->mask = v6 ? 128 : 32;
 	if ((cur = tb[ROUTE_MASK]) != NULL) {
 		route->mask = parse_netmask_string(blobmsg_data(cur), v6);
@@ -92,16 +200,15 @@ interface_ip_add_route(struct interface *iface, struct blob_attr *attr, bool v6)
 		}
 	}
 
-	if ((cur = tb[ROUTE_METRIC]) != NULL)
+	if ((cur = tb[ROUTE_METRIC]) != NULL) {
 		route->metric = blobmsg_get_u32(cur);
+		route->flags |= DEVROUTE_METRIC;
+	}
 
 	if ((cur = tb[ROUTE_MTU]) != NULL)
 		route->mtu = blobmsg_get_u32(cur);
 
-	if (!config && (cur = tb[ROUTE_DEVICE]) != NULL)
-		route->device = device_get(blobmsg_data(cur), true);
-
-	vlist_add(&ip->route, &route->node);
+	vlist_add(&ip->route, &route->node, &route->flags);
 	return;
 
 error:
@@ -112,14 +219,14 @@ static int
 addr_cmp(const void *k1, const void *k2, void *ptr)
 {
 	return memcmp(k1, k2, sizeof(struct device_addr) -
-		      offsetof(struct device_addr, mask));
+		      offsetof(struct device_addr, flags));
 }
 
 static int
 route_cmp(const void *k1, const void *k2, void *ptr)
 {
 	return memcmp(k1, k2, sizeof(struct device_route) -
-		      offsetof(struct device_route, mask));
+		      offsetof(struct device_route, flags));
 }
 
 static void
@@ -130,28 +237,51 @@ interface_update_proto_addr(struct vlist_tree *tree,
 	struct interface_ip_settings *ip;
 	struct interface *iface;
 	struct device *dev;
-	struct device_addr *addr;
+	struct device_addr *a_new = NULL, *a_old = NULL;
 	bool keep = false;
 
 	ip = container_of(tree, struct interface_ip_settings, addr);
 	iface = ip->iface;
-	dev = iface->l3_dev->dev;
+	dev = iface->l3_dev.dev;
 
-	if (node_old && node_new)
+	if (node_new) {
+		a_new = container_of(node_new, struct device_addr, node);
+
+		if ((a_new->flags & DEVADDR_FAMILY) == DEVADDR_INET4 &&
+		    !a_new->broadcast) {
+
+			uint32_t mask = ~0;
+			uint32_t *a = (uint32_t *) &a_new->addr;
+
+			mask >>= a_new->mask;
+			a_new->broadcast = *a | mask;
+		}
+	}
+
+	if (node_old)
+		a_old = container_of(node_old, struct device_addr, node);
+
+	if (a_new && a_old) {
 		keep = true;
 
+		if (a_old->flags != a_new->flags)
+			keep = false;
+
+		if ((a_new->flags & DEVADDR_FAMILY) == DEVADDR_INET4 &&
+		    a_new->broadcast != a_old->broadcast)
+			keep = false;
+	}
+
 	if (node_old) {
-		addr = container_of(node_old, struct device_addr, node);
-		if (!(addr->flags & DEVADDR_EXTERNAL) && addr->enabled && !keep)
-			system_del_address(dev, addr);
-		free(addr);
+		if (!(a_old->flags & DEVADDR_EXTERNAL) && a_old->enabled && !keep)
+			system_del_address(dev, a_old);
+		free(a_old);
 	}
 
 	if (node_new) {
-		addr = container_of(node_new, struct device_addr, node);
-		if (!(addr->flags & DEVADDR_EXTERNAL) && !keep)
-			system_add_address(dev, addr);
-		addr->enabled = true;
+		if (!(a_new->flags & DEVADDR_EXTERNAL) && !keep)
+			system_add_address(dev, a_new);
+		a_new->enabled = true;
 	}
 }
 
@@ -161,7 +291,7 @@ enable_route(struct interface_ip_settings *ip, struct device_route *route)
 	if (ip->no_defaultroute && !route->mask)
 		return false;
 
-	return true;
+	return ip->enabled;
 }
 
 static void
@@ -177,7 +307,7 @@ interface_update_proto_route(struct vlist_tree *tree,
 
 	ip = container_of(tree, struct interface_ip_settings, route);
 	iface = ip->iface;
-	dev = iface->l3_dev->dev;
+	dev = iface->l3_dev.dev;
 
 	route_old = container_of(node_old, struct device_route, node);
 	route_new = container_of(node_new, struct device_route, node);
@@ -197,10 +327,35 @@ interface_update_proto_route(struct vlist_tree *tree,
 		if (!(route_new->flags & DEVADDR_EXTERNAL) && !keep && _enabled)
 			system_add_route(dev, route_new);
 
+		route_new->iface = iface;
 		route_new->enabled = _enabled;
 	}
 }
 
+static void
+interface_update_host_route(struct vlist_tree *tree,
+			     struct vlist_node *node_new,
+			     struct vlist_node *node_old)
+{
+	struct interface *iface;
+	struct device *dev;
+	struct device_route *route_old, *route_new;
+
+	iface = container_of(tree, struct interface, host_routes);
+	dev = iface->l3_dev.dev;
+
+	route_old = container_of(node_old, struct device_route, node);
+	route_new = container_of(node_new, struct device_route, node);
+
+	if (node_old) {
+		system_del_route(dev, route_old);
+		free(route_old);
+	}
+
+	if (node_new)
+		system_add_route(dev, route_new);
+}
+
 void
 interface_add_dns_server(struct interface_ip_settings *ip, const char *str)
 {
@@ -337,7 +492,7 @@ void interface_ip_set_enabled(struct interface_ip_settings *ip, bool enabled)
 	struct device *dev;
 
 	ip->enabled = enabled;
-	dev = ip->iface->l3_dev->dev;
+	dev = ip->iface->l3_dev.dev;
 	if (!dev)
 		return;
 
@@ -361,9 +516,12 @@ void interface_ip_set_enabled(struct interface_ip_settings *ip, bool enabled)
 		if (route->enabled == _enabled)
 			continue;
 
-		if (_enabled)
+		if (_enabled) {
+			if (!(route->flags & DEVROUTE_METRIC))
+				route->metric = ip->iface->metric;
+
 			system_add_route(dev, route);
-		else
+		} else
 			system_del_route(dev, route);
 		route->enabled = _enabled;
 	}
@@ -390,21 +548,29 @@ interface_ip_update_complete(struct interface_ip_settings *ip)
 void
 interface_ip_flush(struct interface_ip_settings *ip)
 {
+	if (ip == &ip->iface->proto_ip)
+		vlist_flush_all(&ip->iface->host_routes);
 	vlist_simple_flush_all(&ip->dns_servers);
 	vlist_simple_flush_all(&ip->dns_search);
 	vlist_flush_all(&ip->route);
 	vlist_flush_all(&ip->addr);
 }
 
-void
-interface_ip_init(struct interface_ip_settings *ip, struct interface *iface)
+static void
+__interface_ip_init(struct interface_ip_settings *ip, struct interface *iface)
 {
 	ip->iface = iface;
 	ip->enabled = true;
 	vlist_simple_init(&ip->dns_search, struct dns_search_domain, node);
 	vlist_simple_init(&ip->dns_servers, struct dns_server, node);
-	vlist_init(&ip->route, route_cmp, interface_update_proto_route,
-		   struct device_route, node, mask);
-	vlist_init(&ip->addr, addr_cmp, interface_update_proto_addr,
-		   struct device_addr, node, mask);
+	vlist_init(&ip->route, route_cmp, interface_update_proto_route);
+	vlist_init(&ip->addr, addr_cmp, interface_update_proto_addr);
+}
+
+void
+interface_ip_init(struct interface *iface)
+{
+	__interface_ip_init(&iface->proto_ip, iface);
+	__interface_ip_init(&iface->config_ip, iface);
+	vlist_init(&iface->host_routes, route_cmp, interface_update_host_route);
 }