X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface-ip.c;h=b720eff5539834887bddcd3ce5cb7e72a3a56cbf;hp=fc5a4a3aabfae0b945cd2f4a69b1963e57cfa1c8;hb=91228b6efb36c8954e3d23c0801f54ee984d5a0a;hpb=486aa750a164d41905beb61afec89268e3eb7f48

diff --git a/interface-ip.c b/interface-ip.c
index fc5a4a3..b720eff 100644
--- a/interface-ip.c
+++ b/interface-ip.c
@@ -1,6 +1,7 @@
 /*
  * netifd - network interface daemon
  * Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2012 Steven Barth <steven@midlink.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2
@@ -16,6 +17,7 @@
 #include <stdio.h>
 #include <unistd.h>
 
+#include <limits.h>
 #include <arpa/inet.h>
 
 #include "netifd.h"
@@ -34,6 +36,7 @@ enum {
 	ROUTE_METRIC,
 	ROUTE_MTU,
 	ROUTE_VALID,
+	ROUTE_TABLE,
 	__ROUTE_MAX
 };
 
@@ -44,6 +47,7 @@ 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 },
 };
 
@@ -87,6 +91,44 @@ match_if_addr(union if_addr *a1, union if_addr *a2, int mask)
 	return !memcmp(p1, p2, sizeof(*p1));
 }
 
+static int set_ip_source_policy(bool add, bool v6, unsigned int priority,
+		const union if_addr *addr, uint8_t mask, struct interface *iface)
+{
+
+
+	struct iprule rule = {
+		.flags = IPRULE_SRC | IPRULE_LOOKUP | IPRULE_PRIORITY,
+		.priority = priority,
+		.lookup = (v6) ? iface->ip6table : iface->ip4table,
+		.src_addr = *addr,
+		.src_mask = mask,
+	};
+
+	if (!rule.lookup)
+		return 0;
+
+	rule.flags |= (v6) ? IPRULE_INET6 : IPRULE_INET4;
+
+	return (add) ? system_add_iprule(&rule) : system_del_iprule(&rule);
+}
+
+static int set_ip_lo_policy(bool add, bool v6, struct interface *iface)
+{
+	struct iprule rule = {
+		.flags = IPRULE_IN | IPRULE_LOOKUP | IPRULE_PRIORITY,
+		.priority = IPRULE_PRIORITY_NW + iface->l3_dev.dev->ifindex,
+		.lookup = (v6) ? iface->ip6table : iface->ip4table,
+		.in_dev = "lo"
+	};
+
+	if (!rule.lookup)
+		return 0;
+
+	rule.flags |= (v6) ? IPRULE_INET6 : IPRULE_INET4;
+
+	return (add) ? system_add_iprule(&rule) : system_del_iprule(&rule);
+}
+
 static bool
 __find_ip_addr_target(struct interface_ip_settings *ip, union if_addr *a, bool v6)
 {
@@ -99,7 +141,13 @@ __find_ip_addr_target(struct interface_ip_settings *ip, union if_addr *a, bool v
 		if (v6 != ((addr->flags & DEVADDR_FAMILY) == DEVADDR_INET6))
 			continue;
 
-		if (!match_if_addr(&addr->addr, a, addr->mask))
+		// Handle offlink addresses correctly
+		unsigned int mask = addr->mask;
+		if ((addr->flags & DEVADDR_FAMILY) == DEVADDR_INET6 &&
+				(addr->flags & DEVADDR_OFFLINK))
+			mask = 128;
+
+		if (!match_if_addr(&addr->addr, a, mask))
 			continue;
 
 		return true;
@@ -124,6 +172,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;
 	}
@@ -145,9 +196,8 @@ interface_ip_find_route_target(struct interface *iface, union if_addr *a,
 }
 
 struct interface *
-interface_ip_add_target_route(union if_addr *addr, bool v6)
+interface_ip_add_target_route(union if_addr *addr, bool v6, struct interface *iface)
 {
-	struct interface *iface;
 	struct device_route *route, *r_next = NULL;
 	bool defaultroute_target = false;
 	int addrsize = v6 ? sizeof(addr->in6) : sizeof(addr->in);
@@ -163,7 +213,7 @@ interface_ip_add_target_route(union if_addr *addr, bool v6)
 	else
 		memcpy(&route->addr, addr, addrsize);
 
-	vlist_for_each_element(&interfaces, iface, node) {
+	if (iface) {
 		/* look for locally addressable target first */
 		if (interface_ip_find_addr_target(iface, addr, v6))
 			goto done;
@@ -171,6 +221,16 @@ interface_ip_add_target_route(union if_addr *addr, bool v6)
 		/* 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);
+	} else {
+		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) {
@@ -182,13 +242,14 @@ interface_ip_add_target_route(union if_addr *addr, bool v6)
 	memcpy(&route->nexthop, &r_next->nexthop, sizeof(route->nexthop));
 	route->mtu = r_next->mtu;
 	route->metric = r_next->metric;
+	route->table = r_next->table;
 
 done:
 	route->iface = iface;
 	if (defaultroute_target)
 		free(route);
 	else
-		vlist_add(&iface->host_routes, &route->node, &route->flags);
+		vlist_add(&iface->host_routes, &route->node, route);
 	return iface;
 }
 
@@ -199,6 +260,7 @@ 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));
 
@@ -251,10 +313,30 @@ interface_ip_add_route(struct interface *iface, struct blob_attr *attr, bool v6)
 		route->flags |= DEVROUTE_MTU;
 	}
 
-	if ((cur = tb[ROUTE_VALID]) != NULL)
-		route->valid_until = system_get_rtime() + blobmsg_get_u32(cur);
+	// Use source-based routing
+	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));
+			goto error;
+		}
+
+		if (route->table)
+			route->flags |= DEVROUTE_TABLE;
+	}
+
+	if ((cur = tb[ROUTE_VALID]) != NULL) {
+		int64_t valid = blobmsg_get_u32(cur);
+		int64_t valid_until = valid + (int64_t)system_get_rtime();
+		if (valid_until <= LONG_MAX && valid != 0xffffffffLL) // Catch overflow
+			route->valid_until = valid_until;
+	}
 
-	vlist_add(&ip->route, &route->node, &route->flags);
+	vlist_add(&ip->route, &route->node, route);
 	return;
 
 error:
@@ -271,8 +353,18 @@ addr_cmp(const void *k1, const void *k2, void *ptr)
 static int
 route_cmp(const void *k1, const void *k2, void *ptr)
 {
-	return memcmp(k1, k2, sizeof(struct device_route) -
-		      offsetof(struct device_route, flags));
+	const struct device_route *r1 = k1, *r2 = k2;
+
+	if (r1->mask != r2->mask)
+		return r2->mask - r1->mask;
+
+	if (r1->metric != r2->metric)
+		return r1->metric - r2->metric;
+
+	if (r1->flags != r2->flags)
+		return r2->flags - r1->flags;
+
+	return memcmp(&r1->addr, &r2->addr, sizeof(r1->addr));
 }
 
 static int
@@ -320,6 +412,7 @@ interface_update_proto_addr(struct vlist_tree *tree,
 	struct device *dev;
 	struct device_addr *a_new = NULL, *a_old = NULL;
 	bool keep = false;
+	bool v6 = false;
 
 	ip = container_of(tree, struct interface_ip_settings, addr);
 	iface = ip->iface;
@@ -358,6 +451,19 @@ 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;
+
+			//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, iface);
+			set_ip_source_policy(false, v6, IPRULE_PRIORITY_NW, &a_old->addr,
+				a_old->mask, iface);
+
 			system_del_address(dev, a_old);
 		}
 		free(a_old);
@@ -367,6 +473,15 @@ 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 ((a_new->flags & DEVADDR_FAMILY) == DEVADDR_INET6)
+				v6 = true;
+
+			set_ip_source_policy(true, v6, IPRULE_PRIORITY_ADDR, &a_new->addr,
+				(v6) ? 128 : 32, iface);
+			set_ip_source_policy(true, v6, IPRULE_PRIORITY_NW, &a_new->addr,
+				a_new->mask, iface);
+
 			if ((a_new->flags & DEVADDR_OFFLINK) || iface->metric)
 				interface_handle_subnet_route(iface, a_new, true);
 		}
@@ -449,10 +564,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;
 
@@ -460,113 +575,162 @@ 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) {
-			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);
-		}
-	} 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;
 	}
-	assignment->enabled = add;
 }
 
-
-static void
-interface_update_prefix_assignments(struct vlist_tree *tree,
-			     struct vlist_node *node_new,
-			     struct vlist_node *node_old)
+static bool interface_prefix_assign(struct list_head *list,
+		struct device_prefix_assignment *assign)
 {
-	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);
+	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)));
+	}
+	return false;
+}
 
-	// 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);
+static void interface_update_prefix_assignments(struct device_prefix *prefix, bool setup)
+{
+	struct device_prefix_assignment *c;
+	struct interface *iface;
 
-	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;
+	// 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);
+	}
 
-		// Invert assignment
-		uint64_t assigned = ~prefix->avail;
-		assigned &= (1ULL << (64 - prefix->length)) - 1;
-		assigned &= ~(want - 1);
+	if (!setup)
+		return;
 
-		// 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;
+	// 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);
 	}
 
-	if (node_new && (iface->state == IFS_UP || iface->state == IFS_SETUP))
-		interface_set_prefix_address(iface, true, new);
-}
-
+	bool assigned_any = false;
+	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;
 
-void
-interface_ip_set_prefix_assignment(struct device_prefix *prefix,
-		struct interface *iface, uint8_t length)
-{
-	struct device_prefix_assignment *assignment;
+		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 (!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;
+		if (c->assigned != -1)
+			assigned_any = true;
+	}
 
-		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);
+
+		bool assigned = false;
+		do {
+			assigned = interface_prefix_assign(&prefix->assignments, c);
+		} while (!assigned && ++c->length <= 64);
+
+		if (!assigned) {
+			netifd_log_message(L_WARNING, "Failed to assign subprefix "
+					"of size %hhu for %s\n", c->length, c->name);
+			free(c);
+		} else {
+			assigned_any = true;
 		}
+	}
 
-		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);
+
+	if (!assigned_any)
+		netifd_log_message(L_WARNING, "You have delegated IPv6-prefixes but haven't assigned them "
+				"to any interface. Did you forget to set option ip6assign on your lan-interfaces?");
+}
 
-		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,
@@ -583,55 +747,50 @@ 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;
 
+
+	struct device_prefix_assignment *c;
+	struct interface *iface;
+
 	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);
-		}
+		// Move assignments and refresh addresses to update valid times
+		list_splice(&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) {
-		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);
-
-		// 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);
-
-		// Set null-route to avoid routing loops
+		// Set null-route to avoid routing loops and set routing policy
 		system_add_route(NULL, &route);
-	}
+		if (prefix_new->iface)
+			set_ip_source_policy(true, true, IPRULE_PRIORITY_NW, &route.addr,
+					route.mask, prefix_new->iface);
+
+
+		interface_update_prefix_assignments(prefix_new, true);
+	} else if (node_old) {
+		interface_update_prefix_assignments(prefix_old, false);
 
-	if (node_old) {
 		// Remove null-route
+		if (prefix_old->iface)
+			set_ip_source_policy(false, true, IPRULE_PRIORITY_NW, &route.addr,
+					route.mask, prefix_old->iface);
 		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);
+
 }
 
 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;
@@ -639,6 +798,12 @@ interface_ip_add_device_prefix(struct interface *iface, struct in6_addr *addr,
 	prefix->preferred_until = preferred_until;
 	prefix->valid_until = valid_until;
 	prefix->iface = iface;
+	INIT_LIST_HEAD(&prefix->assignments);
+
+	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);
@@ -675,7 +840,8 @@ interface_ip_set_ula_prefix(const char *prefix)
 		if (ula_prefix)
 			interface_update_prefix(NULL, NULL, &ula_prefix->node);
 
-		ula_prefix = interface_ip_add_device_prefix(NULL, &addr, length, 0, 0);
+		ula_prefix = interface_ip_add_device_prefix(NULL, &addr, length,
+				0, 0, NULL, 0);
 	}
 }
 
@@ -760,7 +926,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));
@@ -866,6 +1032,16 @@ 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);
+
+	set_ip_lo_policy(enabled, true, ip->iface);
+	set_ip_lo_policy(enabled, false, ip->iface);
 }
 
 void