X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface-ip.c;h=6f4201592068fc597c3c69779f73e3421fd6000a;hp=3bd92cf49198c22b0d1b845e5f31b44c082f1a64;hb=235a02424c3ab1b59308895c4f00395dacf2557c;hpb=34192161b45520713ebaa5447553fa546e6ee932

diff --git a/interface-ip.c b/interface-ip.c
index 3bd92cf..6f42015 100644
--- a/interface-ip.c
+++ b/interface-ip.c
@@ -18,6 +18,7 @@
 
 #include <limits.h>
 #include <arpa/inet.h>
+#include <netinet/in.h>
 
 #include "netifd.h"
 #include "device.h"
@@ -322,7 +323,8 @@ 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);
@@ -480,7 +482,7 @@ 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->failed)
 			keep = false;
 
 		if (a_old->valid_until != a_new->valid_until ||
@@ -521,7 +523,8 @@ interface_update_proto_addr(struct vlist_tree *tree,
 	if (node_new) {
 		a_new->enabled = true;
 		if (!(a_new->flags & DEVADDR_EXTERNAL) && (!keep || replace)) {
-			system_add_address(dev, a_new);
+			if (system_add_address(dev, a_new))
+				a_new->failed = true;
 
 			if (!keep) {
 				if ((a_new->flags & DEVADDR_FAMILY) == DEVADDR_INET6)
@@ -575,7 +578,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->table == route_new->table);
+			(route_old->table == route_new->table) && !route_old->failed;
 
 	if (node_old) {
 		if (!(route_old->flags & DEVADDR_EXTERNAL) && route_old->enabled && !keep)
@@ -587,11 +590,9 @@ interface_update_proto_route(struct vlist_tree *tree,
 	if (node_new) {
 		bool _enabled = enable_route(ip, route_new);
 
-		if (!(route_new->flags & DEVROUTE_METRIC))
-			route_new->metric = iface->metric;
-
 		if (!(route_new->flags & DEVADDR_EXTERNAL) && !keep && _enabled)
-			system_add_route(dev, route_new);
+			if (system_add_route(dev, route_new))
+				route_new->failed = true;
 
 		route_new->iface = iface;
 		route_new->enabled = _enabled;
@@ -1027,7 +1028,7 @@ interface_add_dns_search_list(struct interface_ip_settings *ip, struct blob_attr
 }
 
 static void
-write_resolv_conf_entries(FILE *f, struct interface_ip_settings *ip)
+write_resolv_conf_entries(FILE *f, struct interface_ip_settings *ip, const char *dev)
 {
 	struct dns_server *s;
 	struct dns_search_domain *d;
@@ -1039,7 +1040,10 @@ write_resolv_conf_entries(FILE *f, struct interface_ip_settings *ip)
 		if (!str)
 			continue;
 
-		fprintf(f, "nameserver %s\n", str);
+		if (s->af == AF_INET6 && IN6_IS_ADDR_LINKLOCAL(&s->addr))
+			fprintf(f, "nameserver %s%%%s\n", str, dev);
+		else
+			fprintf(f, "nameserver %s\n", str);
 	}
 
 	vlist_simple_for_each_element(&ip->dns_search, d, node) {
@@ -1074,9 +1078,9 @@ interface_write_resolv_conf(void)
 			continue;
 
 		fprintf(f, "# Interface %s\n", iface->name);
-		write_resolv_conf_entries(f, &iface->config_ip);
+		write_resolv_conf_entries(f, &iface->config_ip, iface->ifname);
 		if (!iface->proto_ip.no_dns)
-			write_resolv_conf_entries(f, &iface->proto_ip);
+			write_resolv_conf_entries(f, &iface->proto_ip, iface->ifname);
 	}
 	fflush(f);
 	rewind(f);