X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface-ip.c;h=93e8723be216b9408144970885e7b59f981f2b93;hp=3db7e1a11f18d5dbeefe3cee3e280965d33cf560;hb=f5ca090c260a74fd3576f79ffb8799e8c20e3878;hpb=ea6dec1329b08109387f091b60a13d1b40839317

diff --git a/interface-ip.c b/interface-ip.c
index 3db7e1a..93e8723 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 },
 };
@@ -46,13 +44,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 +56,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;
 	}
@@ -90,17 +83,18 @@ interface_ip_add_route(struct interface *iface, struct blob_attr *attr, bool v6)
 			DPRINTF("Failed to parse route gateway: %s\n", (char *) blobmsg_data(cur));
 			goto error;
 		}
+	} else {
+		route->flags |= DEVADDR_DEVICE;
 	}
 
 	if ((cur = tb[ROUTE_METRIC]) != NULL)
 		route->metric = blobmsg_get_u32(cur);
+	else
+		route->metric = -1;
 
 	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);
 	return;
 
@@ -131,26 +125,39 @@ interface_update_proto_addr(struct vlist_tree *tree,
 	struct interface *iface;
 	struct device *dev;
 	struct device_addr *addr;
+	bool keep = false;
 
 	ip = container_of(tree, struct interface_ip_settings, addr);
 	iface = ip->iface;
 	dev = iface->l3_dev->dev;
 
+	if (node_old && node_new)
+		keep = true;
+
 	if (node_old) {
 		addr = container_of(node_old, struct device_addr, node);
-		if (!(addr->flags & DEVADDR_EXTERNAL) && addr->enabled)
+		if (!(addr->flags & DEVADDR_EXTERNAL) && addr->enabled && !keep)
 			system_del_address(dev, addr);
 		free(addr);
 	}
 
 	if (node_new) {
 		addr = container_of(node_new, struct device_addr, node);
-		if (!(addr->flags & DEVADDR_EXTERNAL))
+		if (!(addr->flags & DEVADDR_EXTERNAL) && !keep)
 			system_add_address(dev, addr);
 		addr->enabled = true;
 	}
 }
 
+static bool
+enable_route(struct interface_ip_settings *ip, struct device_route *route)
+{
+	if (ip->no_defaultroute && !route->mask)
+		return false;
+
+	return true;
+}
+
 static void
 interface_update_proto_route(struct vlist_tree *tree,
 			     struct vlist_node *node_new,
@@ -159,24 +166,32 @@ interface_update_proto_route(struct vlist_tree *tree,
 	struct interface_ip_settings *ip;
 	struct interface *iface;
 	struct device *dev;
-	struct device_route *route;
+	struct device_route *route_old, *route_new;
+	bool keep = false;
 
 	ip = container_of(tree, struct interface_ip_settings, route);
 	iface = ip->iface;
 	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 && node_new)
+		keep = !memcmp(&route_old->nexthop, &route_new->nexthop, sizeof(route_old->nexthop));
+
 	if (node_old) {
-		route = container_of(node_old, struct device_route, node);
-		if (!(route->flags & DEVADDR_EXTERNAL) && route->enabled)
-			system_del_route(dev, route);
-		free(route);
+		if (!(route_old->flags & DEVADDR_EXTERNAL) && route_old->enabled && !keep)
+			system_del_route(dev, route_old);
+		free(route_old);
 	}
 
 	if (node_new) {
-		route = container_of(node_new, struct device_route, node);
-		if (!(route->flags & DEVADDR_EXTERNAL))
-			system_add_route(dev, route);
-		route->enabled = true;
+		bool _enabled = enable_route(ip, route_new);
+
+		if (!(route_new->flags & DEVADDR_EXTERNAL) && !keep && _enabled)
+			system_add_route(dev, route_new);
+
+		route_new->enabled = _enabled;
 	}
 }
 
@@ -200,7 +215,7 @@ interface_add_dns_server(struct interface_ip_settings *ip, const char *str)
 add:
 	D(INTERFACE, "Add IPv%c DNS server: %s\n",
 	  s->af == AF_INET6 ? '6' : '4', str);
-	list_add_tail(&s->list, &ip->dns_servers);
+	vlist_simple_add(&ip->dns_servers, &s->node);
 }
 
 void
@@ -232,7 +247,7 @@ interface_add_dns_search_domain(struct interface_ip_settings *ip, const char *st
 
 	D(INTERFACE, "Add DNS search domain: %s\n", str);
 	memcpy(s->name, str, len);
-	list_add_tail(&s->list, &ip->dns_search);
+	vlist_simple_add(&ip->dns_search, &s->node);
 }
 
 void
@@ -253,24 +268,23 @@ interface_add_dns_search_list(struct interface_ip_settings *ip, struct blob_attr
 }
 
 static void
-interface_clear_dns_servers(struct interface_ip_settings *ip)
+write_resolv_conf_entries(FILE *f, struct interface_ip_settings *ip)
 {
-	struct dns_server *s, *tmp;
+	struct dns_server *s;
+	struct dns_search_domain *d;
+	const char *str;
+	char buf[32];
 
-	list_for_each_entry_safe(s, tmp, &ip->dns_servers, list) {
-		list_del(&s->list);
-		free(s);
-	}
-}
+	vlist_simple_for_each_element(&ip->dns_servers, s, node) {
+		str = inet_ntop(s->af, &s->addr, buf, sizeof(buf));
+		if (!str)
+			continue;
 
-static void
-interface_clear_dns_search(struct interface_ip_settings *ip)
-{
-	struct dns_search_domain *s, *tmp;
+		fprintf(f, "nameserver %s\n", str);
+	}
 
-	list_for_each_entry_safe(s, tmp, &ip->dns_search, list) {
-		list_del(&s->list);
-		free(s);
+	vlist_simple_for_each_element(&ip->dns_search, d, node) {
+		fprintf(f, "search %s\n", d->name);
 	}
 }
 
@@ -278,11 +292,7 @@ void
 interface_write_resolv_conf(void)
 {
 	struct interface *iface;
-	struct dns_server *s;
-	struct dns_search_domain *d;
 	char *path = alloca(strlen(resolv_conf) + 5);
-	const char *str;
-	char buf[32];
 	FILE *f;
 
 	sprintf(path, "%s.tmp", resolv_conf);
@@ -297,22 +307,15 @@ interface_write_resolv_conf(void)
 		if (iface->state != IFS_UP)
 			continue;
 
-		if (list_empty(&iface->proto_ip.dns_search) &&
-		    list_empty(&iface->proto_ip.dns_servers))
+		if (vlist_simple_empty(&iface->proto_ip.dns_search) &&
+		    vlist_simple_empty(&iface->proto_ip.dns_servers) &&
+			vlist_simple_empty(&iface->config_ip.dns_search) &&
+		    vlist_simple_empty(&iface->config_ip.dns_servers))
 			continue;
 
 		fprintf(f, "# Interface %s\n", iface->name);
-		list_for_each_entry(s, &iface->proto_ip.dns_servers, list) {
-			str = inet_ntop(s->af, &s->addr, buf, sizeof(buf));
-			if (!str)
-				continue;
-
-			fprintf(f, "nameserver %s\n", str);
-		}
-
-		list_for_each_entry(d, &iface->proto_ip.dns_search, list) {
-			fprintf(f, "search %s\n", d->name);
-		}
+		write_resolv_conf_entries(f, &iface->config_ip);
+		write_resolv_conf_entries(f, &iface->proto_ip);
 	}
 	fclose(f);
 	if (rename(path, resolv_conf) < 0) {
@@ -344,22 +347,27 @@ void interface_ip_set_enabled(struct interface_ip_settings *ip, bool enabled)
 	}
 
 	vlist_for_each_element(&ip->route, route, node) {
-		if (route->enabled == enabled)
+		bool _enabled = enabled;
+
+		if (!enable_route(ip, route))
+			_enabled = false;
+
+		if (route->enabled == _enabled)
 			continue;
 
-		if (enabled)
+		if (_enabled)
 			system_add_route(dev, route);
 		else
 			system_del_route(dev, route);
-		route->enabled = enabled;
+		route->enabled = _enabled;
 	}
 }
 
 void
 interface_ip_update_start(struct interface_ip_settings *ip)
 {
-	interface_clear_dns_servers(ip);
-	interface_clear_dns_search(ip);
+	vlist_simple_update(&ip->dns_servers);
+	vlist_simple_update(&ip->dns_search);
 	vlist_update(&ip->route);
 	vlist_update(&ip->addr);
 }
@@ -367,6 +375,8 @@ interface_ip_update_start(struct interface_ip_settings *ip)
 void
 interface_ip_update_complete(struct interface_ip_settings *ip)
 {
+	vlist_simple_flush(&ip->dns_servers);
+	vlist_simple_flush(&ip->dns_search);
 	vlist_flush(&ip->route);
 	vlist_flush(&ip->addr);
 }
@@ -374,8 +384,8 @@ interface_ip_update_complete(struct interface_ip_settings *ip)
 void
 interface_ip_flush(struct interface_ip_settings *ip)
 {
-	interface_clear_dns_servers(ip);
-	interface_clear_dns_search(ip);
+	vlist_simple_flush_all(&ip->dns_servers);
+	vlist_simple_flush_all(&ip->dns_search);
 	vlist_flush_all(&ip->route);
 	vlist_flush_all(&ip->addr);
 }
@@ -385,8 +395,8 @@ interface_ip_init(struct interface_ip_settings *ip, struct interface *iface)
 {
 	ip->iface = iface;
 	ip->enabled = true;
-	INIT_LIST_HEAD(&ip->dns_search);
-	INIT_LIST_HEAD(&ip->dns_servers);
+	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,