X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface-ip.c;h=190c1583e2ce9600eb5ba48f59503a09840897a1;hp=ea4c3ddbf989b31c22481caee15b8e2f77c8ec6a;hb=abba48ec2eac7965adac2c590d4d233c03b27c72;hpb=7496f70e45964d9e4ac870582c8e4e3ce7c56ad6

diff --git a/interface-ip.c b/interface-ip.c
index ea4c3dd..190c158 100644
--- a/interface-ip.c
+++ b/interface-ip.c
@@ -33,6 +33,8 @@ enum {
 	ROUTE_GATEWAY,
 	ROUTE_METRIC,
 	ROUTE_MTU,
+	ROUTE_VALID,
+	ROUTE_TABLE,
 	__ROUTE_MAX
 };
 
@@ -43,6 +45,8 @@ static const struct blobmsg_policy route_attr[__ROUTE_MAX] = {
 	[ROUTE_GATEWAY] = { .name = "gateway", .type = BLOBMSG_TYPE_STRING },
 	[ROUTE_METRIC] = { .name = "metric", .type = BLOBMSG_TYPE_INT32 },
 	[ROUTE_MTU] = { .name = "mtu", .type = BLOBMSG_TYPE_INT32 },
+	[ROUTE_TABLE] = { .name = "table", .type = BLOBMSG_TYPE_STRING },
+	[ROUTE_VALID] = { .name = "valid", .type = BLOBMSG_TYPE_INT32 },
 };
 
 const struct config_param_list route_attr_list = {
@@ -53,6 +57,7 @@ const struct config_param_list route_attr_list = {
 
 struct list_head prefixes = LIST_HEAD_INIT(prefixes);
 static struct device_prefix *ula_prefix = NULL;
+static struct uloop_timeout valid_until_timeout;
 
 
 static void
@@ -121,6 +126,9 @@ __find_ip_route_target(struct interface_ip_settings *ip, union if_addr *a,
 		if (!match_if_addr(&route->addr, a, route->mask))
 			continue;
 
+		if (route->flags & DEVROUTE_TABLE)
+			continue;
+
 		if (!*res || route->mask < (*res)->mask)
 			*res = route;
 	}
@@ -248,6 +256,19 @@ interface_ip_add_route(struct interface *iface, struct blob_attr *attr, bool v6)
 		route->flags |= DEVROUTE_MTU;
 	}
 
+	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));
+			goto error;
+		}
+
+		if (route->table)
+			route->flags |= DEVROUTE_TABLE;
+	}
+
+	if ((cur = tb[ROUTE_VALID]) != NULL)
+		route->valid_until = system_get_rtime() + blobmsg_get_u32(cur);
+
 	vlist_add(&ip->route, &route->node, &route->flags);
 	return;
 
@@ -293,11 +314,14 @@ interface_handle_subnet_route(struct interface *iface, struct device_addr *addr,
 		route.flags |= DEVADDR_KERNEL;
 		system_del_route(dev, &route);
 
-		route.flags &= ~DEVADDR_KERNEL;
-		route.metric = iface->metric;
-		system_add_route(dev, &route);
+		if (!(addr->flags & DEVADDR_OFFLINK)) {
+			route.flags &= ~DEVADDR_KERNEL;
+			route.metric = iface->metric;
+			system_add_route(dev, &route);
+		}
 	} else {
-		system_del_route(dev, &route);
+		if (!(addr->flags & DEVADDR_OFFLINK))
+			system_del_route(dev, &route);
 	}
 }
 
@@ -336,7 +360,9 @@ interface_update_proto_addr(struct vlist_tree *tree,
 	if (a_new && a_old) {
 		keep = true;
 
-		if (a_old->flags != a_new->flags)
+		if (a_old->flags != a_new->flags ||
+				a_old->valid_until != a_new->valid_until ||
+				a_old->preferred_until != a_new->preferred_until)
 			keep = false;
 
 		if ((a_new->flags & DEVADDR_FAMILY) == DEVADDR_INET4 &&
@@ -356,7 +382,7 @@ interface_update_proto_addr(struct vlist_tree *tree,
 		a_new->enabled = true;
 		if (!(a_new->flags & DEVADDR_EXTERNAL) && !keep) {
 			system_add_address(dev, a_new);
-			if (iface->metric)
+			if ((a_new->flags & DEVADDR_OFFLINK) || iface->metric)
 				interface_handle_subnet_route(iface, a_new, true);
 		}
 	}
@@ -438,10 +464,10 @@ interface_update_host_route(struct vlist_tree *tree,
 
 
 static void
-interface_set_prefix_address(struct interface *iface, bool add,
-		struct device_prefix_assignment *assignment)
+interface_set_prefix_address(struct device_prefix_assignment *assignment,
+		const struct device_prefix *prefix, struct interface *iface, bool add)
 {
-	struct interface *uplink = assignment->prefix->iface;
+	const struct interface *uplink = prefix->iface;
 	if (!iface->l3_dev.dev)
 		return;
 
@@ -449,108 +475,146 @@ interface_set_prefix_address(struct interface *iface, bool add,
 
 	struct device_addr addr;
 	memset(&addr, 0, sizeof(addr));
-	addr.addr.in6 = assignment->addr;
+	addr.addr.in6 = prefix->addr;
+	addr.addr.in6.s6_addr32[1] |= htonl(assignment->assigned);
+	addr.addr.in6.s6_addr[15] += 1;
 	addr.mask = assignment->length;
 	addr.flags = DEVADDR_INET6;
-	addr.preferred_until = assignment->prefix->preferred_until;
-	addr.valid_until = assignment->prefix->valid_until;
-
-	if (!add) {
-		if (assignment->enabled)
-			system_del_address(l3_downlink, &addr);
-	} else {
+	addr.preferred_until = prefix->preferred_until;
+	addr.valid_until = prefix->valid_until;
+
+	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_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);
-
 		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;
+	}
+}
+
+static bool interface_prefix_assign(struct list_head *list,
+		struct device_prefix_assignment *assign)
+{
+	int32_t current = 0, asize = (1 << (64 - assign->length)) - 1;
+	struct device_prefix_assignment *c;
+	list_for_each_entry(c, list, head) {
+		if (assign->assigned != -1) {
+			if (assign->assigned > current && assign->assigned + asize < c->assigned) {
+				list_add_tail(&assign->head, &c->head);
+				return true;
+			}
+		} else if (assign->assigned == -1) {
+			current = (current + asize) & (~asize);
+			if (current + asize < c->assigned) {
+				assign->assigned = current;
+				list_add_tail(&assign->head, &c->head);
+				return true;
+			}
+		}
+		current = (c->assigned + (1 << (64 - c->length)));
 	}
-	assignment->enabled = add;
+	return false;
 }
 
-
-static void
-interface_update_prefix_assignments(struct vlist_tree *tree,
-			     struct vlist_node *node_new,
-			     struct vlist_node *node_old)
+static void interface_update_prefix_assignments(struct device_prefix *prefix, bool setup)
 {
-	struct device_prefix_assignment *old, *new;
-	old = container_of(node_old, struct device_prefix_assignment, node);
-	new = container_of(node_new, struct device_prefix_assignment, node);
-
-	// Assignments persist across interface reloads etc.
-	// so use indirection to avoid dangling pointers
-	struct interface *iface = vlist_find(&interfaces,
-			(node_new) ? new->name : old->name, iface, node);
-
-	if (node_old && node_new) {
-		new->addr = old->addr;
-		new->length = old->length;
-	} else if (node_old) {
-		if (iface)
-			interface_set_prefix_address(iface, false, old);
-		free(old);
-	} else if (node_new) {
-		struct device_prefix *prefix = new->prefix;
-		uint64_t want = 1ULL << (64 - new->length);
-		prefix->avail &= ~(want - 1);
-		prefix->avail -= want;
-
-		// Invert assignment
-		uint64_t assigned = ~prefix->avail;
-		assigned &= (1ULL << (64 - prefix->length)) - 1;
-		assigned &= ~(want - 1);
+	struct device_prefix_assignment *c;
+	struct interface *iface;
 
-		// Assignment
-		new->addr = prefix->addr;
-		new->addr.s6_addr32[0] |=
-				htonl(assigned >> 32);
-		new->addr.s6_addr32[1] |=
-				htonl(assigned & 0xffffffffU);
-		new->addr.s6_addr[15] += 1;
+	// Delete all assignments
+	while (!list_empty(&prefix->assignments)) {
+		c = list_first_entry(&prefix->assignments,
+				struct device_prefix_assignment, head);
+		if ((iface = vlist_find(&interfaces, c->name, iface, node)))
+			interface_set_prefix_address(c, prefix, iface, false);
+		list_del(&c->head);
+		free(c);
 	}
 
-	if (node_new && (iface->state == IFS_UP || iface->state == IFS_SETUP))
-		interface_set_prefix_address(iface, true, new);
-}
-
+	if (!setup)
+		return;
 
-void
-interface_ip_set_prefix_assignment(struct device_prefix *prefix,
-		struct interface *iface, uint8_t length)
-{
-	struct device_prefix_assignment *assignment;
+	// End-of-assignment sentinel
+	c = malloc(sizeof(*c) + 1);
+	c->assigned = 1 << (64 - prefix->length);
+	c->length = 64;
+	c->name[0] = 0;
+	list_add(&c->head, &prefix->assignments);
+
+	// Excluded prefix
+	if (prefix->excl_length > 0) {
+		const char name[] = "!excluded";
+		c = malloc(sizeof(*c) + sizeof(name));
+		c->assigned = ntohl(prefix->excl_addr.s6_addr32[1]) &
+				((1 << (64 - prefix->length)) - 1);
+		c->length = prefix->excl_length;
+		memcpy(c->name, name, sizeof(name));
+		list_add(&c->head, &prefix->assignments);
+	}
+
+	struct list_head assign_later = LIST_HEAD_INIT(assign_later);
+	vlist_for_each_element(&interfaces, iface, node) {
+		if (iface->config_ip.assignment_length < 48 ||
+				iface->config_ip.assignment_length > 64)
+			continue;
 
-	if (!length || length > 64) {
-		assignment = vlist_find(prefix->assignments, iface->name, assignment, node);
-		if (assignment)
-			interface_set_prefix_address(iface, false, assignment);
-	} else {
-		uint64_t want = 1ULL << (64 - length);
-		char *name;
+		size_t namelen = strlen(iface->name) + 1;
+		c = malloc(sizeof(*c) + namelen);
+		c->length = iface->config_ip.assignment_length;
+		c->assigned = iface->config_ip.assignment_hint;
+		c->enabled = false;
+		memcpy(c->name, iface->name, namelen);
+
+		// First process all custom assignments, put all others in later-list
+		if (c->assigned == -1 || !interface_prefix_assign(&prefix->assignments, c)) {
+			if (c->assigned != -1) {
+				c->assigned = -1;
+				netifd_log_message(L_WARNING, "Failed to assign requested subprefix "
+						"of size %hhu for %s, trying other\n", c->length, c->name);
+			}
+			list_add_tail(&c->head, &assign_later);
+		}
+	}
 
-		if (prefix->avail < want && prefix->avail > 0) {
-			do {
-				want = 1ULL << (64 - ++length);
-			} while (want > prefix->avail);
+	// Then try to assign all other + failed custom assignments
+	while (!list_empty(&assign_later)) {
+		c = list_first_entry(&assign_later, struct device_prefix_assignment, head);
+		list_del(&c->head);
+		if (!interface_prefix_assign(&prefix->assignments, c)) {
+			netifd_log_message(L_WARNING, "Failed to assign subprefix "
+					"of size %hhu for %s\n", c->length, c->name);
+			free(c);
 		}
+	}
 
-		if (prefix->avail < want)
-			return;
+	list_for_each_entry(c, &prefix->assignments, head)
+		if ((iface = vlist_find(&interfaces, c->name, iface, node)))
+			interface_set_prefix_address(c, prefix, iface, true);
+}
 
-		assignment = calloc_a(sizeof(*assignment),
-			&name, strlen(iface->name) + 1);
-		assignment->prefix = prefix;
-		assignment->length = length;
-		assignment->name = strcpy(name, iface->name);
 
-		vlist_add(prefix->assignments, &assignment->node, assignment->name);
+void interface_refresh_assignments(bool hint)
+{
+	static bool refresh = false;
+	if (!hint && refresh) {
+		struct device_prefix *p;
+		list_for_each_entry(p, &prefixes, head)
+			interface_update_prefix_assignments(p, true);
 	}
+	refresh = hint;
 }
 
+
 static void
 interface_update_prefix(struct vlist_tree *tree,
 			     struct vlist_node *node_new,
@@ -567,55 +631,43 @@ interface_update_prefix(struct vlist_tree *tree,
 	route.mask = (node_new) ? prefix_new->length : prefix_old->length;
 	route.addr.in6 = (node_new) ? prefix_new->addr : prefix_old->addr;
 
-	if (node_old && node_new) {
-		prefix_new->avail = prefix_old->avail;
-		prefix_new->assignments = prefix_old->assignments;
-		prefix_old->assignments = NULL;
-
-		// Update all assignments
-		struct device_prefix_assignment *assignment;
-		struct vlist_tree *assignments = prefix_new->assignments;
-		vlist_for_each_element(assignments, assignment, node) {
-			assignment->prefix = prefix_new;
-			assignments->update(assignments,
-					&assignment->node, &assignment->node);
-		}
-	} else if (node_new) {
-		prefix_new->avail = 1ULL << (64 - prefix_new->length);
-		prefix_new->assignments = calloc(1, sizeof(*prefix_new->assignments));
-		vlist_init(prefix_new->assignments, avl_strcmp,
-				interface_update_prefix_assignments);
+	struct device_prefix_assignment *c;
+	struct interface *iface;
 
-		// Create initial assignments for interfaces
-		struct interface *iface;
-		vlist_for_each_element(&interfaces, iface, node)
-			interface_ip_set_prefix_assignment(prefix_new, iface,
-					iface->proto_ip.assignment_length);
+	if (node_old && node_new) {
+		// Move assignments and refresh addresses to update valid times
+		list_splice_init(&prefix_old->assignments, &prefix_new->assignments);
 
+		list_for_each_entry(c, &prefix_new->assignments, head)
+			if ((iface = vlist_find(&interfaces, c->name, iface, node)))
+				interface_set_prefix_address(c, prefix_new, iface, true);
+	} else if (node_new) {
 		// Set null-route to avoid routing loops
 		system_add_route(NULL, &route);
-	}
 
-	if (node_old) {
+		INIT_LIST_HEAD(&prefix_new->assignments);
+		interface_update_prefix_assignments(prefix_new, true);
+	} else if (node_old) {
+		interface_update_prefix_assignments(prefix_old, false);
+
 		// Remove null-route
 		system_del_route(NULL, &route);
+	}
 
+	if (node_old) {
 		list_del(&prefix_old->head);
-
-		if (prefix_old->assignments) {
-			vlist_flush_all(prefix_old->assignments);
-			free(prefix_old->assignments);
-		}
 		free(prefix_old);
 	}
 
 	if (node_new)
 		list_add(&prefix_new->head, &prefixes);
+
 }
 
-void
+struct device_prefix*
 interface_ip_add_device_prefix(struct interface *iface, struct in6_addr *addr,
-		uint8_t length, time_t valid_until, time_t preferred_until)
+		uint8_t length, time_t valid_until, time_t preferred_until,
+		struct in6_addr *excl_addr, uint8_t excl_length)
 {
 	struct device_prefix *prefix = calloc(1, sizeof(*prefix));
 	prefix->length = length;
@@ -624,10 +676,17 @@ interface_ip_add_device_prefix(struct interface *iface, struct in6_addr *addr,
 	prefix->valid_until = valid_until;
 	prefix->iface = iface;
 
+	if (excl_addr) {
+		prefix->excl_addr = *excl_addr;
+		prefix->excl_length = excl_length;
+	}
+
 	if (iface)
 		vlist_add(&iface->proto_ip.prefix, &prefix->node, &prefix->addr);
 	else
 		interface_update_prefix(NULL, &prefix->node, NULL);
+
+	return prefix;
 }
 
 void
@@ -652,13 +711,14 @@ interface_ip_set_ula_prefix(const char *prefix)
 	if (!prefixlen || (length = atoi(prefixlen)) < 1 || length > 64)
 		return;
 
-	if (ula_prefix && (!IN6_ARE_ADDR_EQUAL(&addr, &ula_prefix->addr) ||
-			ula_prefix->length != length)) {
-		interface_update_prefix(NULL, NULL, &ula_prefix->node);
-		ula_prefix = NULL;
-	}
+	if (!ula_prefix || !IN6_ARE_ADDR_EQUAL(&addr, &ula_prefix->addr) ||
+			ula_prefix->length != length) {
+		if (ula_prefix)
+			interface_update_prefix(NULL, NULL, &ula_prefix->node);
 
-	interface_ip_add_device_prefix(NULL, &addr, length, 0, 0);
+		ula_prefix = interface_ip_add_device_prefix(NULL, &addr, length,
+				0, 0, NULL, 0);
+	}
 }
 
 void
@@ -742,7 +802,7 @@ write_resolv_conf_entries(FILE *f, struct interface_ip_settings *ip)
 	struct dns_server *s;
 	struct dns_search_domain *d;
 	const char *str;
-	char buf[32];
+	char buf[INET6_ADDRSTRLEN];
 
 	vlist_simple_for_each_element(&ip->dns_servers, s, node) {
 		str = inet_ntop(s->af, &s->addr, buf, sizeof(buf));
@@ -763,10 +823,11 @@ interface_write_resolv_conf(void)
 	struct interface *iface;
 	char *path = alloca(strlen(resolv_conf) + 5);
 	FILE *f;
+	uint32_t crcold, crcnew;
 
 	sprintf(path, "%s.tmp", resolv_conf);
 	unlink(path);
-	f = fopen(path, "w");
+	f = fopen(path, "w+");
 	if (!f) {
 		D(INTERFACE, "Failed to open %s for writing\n", path);
 		return;
@@ -787,8 +848,21 @@ interface_write_resolv_conf(void)
 		if (!iface->proto_ip.no_dns)
 			write_resolv_conf_entries(f, &iface->proto_ip);
 	}
+	fflush(f);
+	rewind(f);
+	crcnew = crc32_file(f);
 	fclose(f);
-	if (rename(path, resolv_conf) < 0) {
+
+	crcold = crcnew + 1;
+	f = fopen(resolv_conf, "r");
+	if (f) {
+		crcold = crc32_file(f);
+		fclose(f);
+	}
+
+	if (crcold == crcnew) {
+		unlink(path);
+	} else if (rename(path, resolv_conf) < 0) {
 		D(INTERFACE, "Failed to replace %s\n", resolv_conf);
 		unlink(path);
 	}
@@ -834,6 +908,13 @@ void interface_ip_set_enabled(struct interface_ip_settings *ip, bool enabled)
 			system_del_route(dev, route);
 		route->enabled = _enabled;
 	}
+
+	struct device_prefix *c;
+	struct device_prefix_assignment *a;
+	list_for_each_entry(c, &prefixes, head)
+		list_for_each_entry(a, &c->assignments, head)
+			if (!strcmp(a->name, ip->iface->name))
+				interface_set_prefix_address(a, c, ip->iface, enabled);
 }
 
 void
@@ -889,4 +970,42 @@ 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);
+
+}
+
+static void
+interface_ip_valid_until_handler(struct uloop_timeout *t)
+{
+	time_t now = system_get_rtime();
+	struct interface *iface;
+	vlist_for_each_element(&interfaces, iface, node) {
+		if (iface->state != IFS_UP)
+			continue;
+
+		struct device_addr *addr, *addrp;
+		struct device_route *route, *routep;
+		struct device_prefix *pref, *prefp;
+
+		vlist_for_each_element_safe(&iface->proto_ip.addr, addr, node, addrp)
+			if (addr->valid_until && addr->valid_until < now)
+				vlist_delete(&iface->proto_ip.addr, &addr->node);
+
+		vlist_for_each_element_safe(&iface->proto_ip.route, route, node, routep)
+			if (route->valid_until && route->valid_until < now)
+				vlist_delete(&iface->proto_ip.route, &route->node);
+
+		vlist_for_each_element_safe(&iface->proto_ip.prefix, pref, node, prefp)
+			if (pref->valid_until && pref->valid_until < now)
+				vlist_delete(&iface->proto_ip.prefix, &pref->node);
+
+	}
+
+	uloop_timeout_set(t, 1000);
+}
+
+static void __init
+interface_ip_init_worker(void)
+{
+	valid_until_timeout.cb = interface_ip_valid_until_handler;
+	uloop_timeout_set(&valid_until_timeout, 1000);
 }