X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface-ip.c;h=f62d670deeea0111c5b924dc96e1954d91b2d2bd;hp=14feb6fa6ddcdf41b353d6cd82c0c2347c1f9701;hb=875e9e4b93fd8ff1f15e01cfba6ac5359444880a;hpb=8758677c03d3c94d3fd81c8e44b3a7307b693e9c

diff --git a/interface-ip.c b/interface-ip.c
index 14feb6f..f62d670 100644
--- a/interface-ip.c
+++ b/interface-ip.c
@@ -141,14 +141,19 @@ interface_ip_add_target_route(union if_addr *addr, bool v6)
 {
 	struct interface *iface;
 	struct device_route *route, *r_next = NULL;
+	bool defaultroute_target = false;
+	int addrsize = v6 ? sizeof(addr->in6) : sizeof(addr->in);
 
 	route = calloc(1, sizeof(*route));
 	if (!route)
-		return false;
+		return NULL;
 
 	route->flags = v6 ? DEVADDR_INET6 : DEVADDR_INET4;
 	route->mask = v6 ? 128 : 32;
-	memcpy(&route->addr, addr, v6 ? sizeof(addr->in6) : sizeof(addr->in));
+	if (memcmp(&route->addr, addr, addrsize) == 0)
+		defaultroute_target = true;
+	else
+		memcpy(&route->addr, addr, addrsize);
 
 	vlist_for_each_element(&interfaces, iface, node) {
 		/* look for locally addressable target first */
@@ -160,8 +165,10 @@ interface_ip_add_target_route(union if_addr *addr, bool v6)
 		interface_ip_find_route_target(iface, addr, v6, &r_next);
 	}
 
-	if (!r_next)
+	if (!r_next) {
+		free(route);
 		return NULL;
+	}
 
 	iface = r_next->iface;
 	memcpy(&route->nexthop, &r_next->nexthop, sizeof(route->nexthop));
@@ -170,7 +177,10 @@ interface_ip_add_target_route(union if_addr *addr, bool v6)
 
 done:
 	route->iface = iface;
-	vlist_add(&iface->host_routes, &route->node, &route->flags);
+	if (defaultroute_target)
+		free(route);
+	else
+		vlist_add(&iface->host_routes, &route->node, &route->flags);
 	return iface;
 }
 
@@ -210,7 +220,7 @@ interface_ip_add_route(struct interface *iface, struct blob_attr *attr, bool v6)
 	}
 
 	if ((cur = tb[ROUTE_TARGET]) != NULL) {
-		if (!inet_pton(af, blobmsg_data(cur), &route->addr)) {
+		if (!parse_ip_and_netmask(af, blobmsg_data(cur), &route->addr, &route->mask)) {
 			DPRINTF("Failed to parse route target: %s\n", (char *) blobmsg_data(cur));
 			goto error;
 		}
@@ -228,8 +238,10 @@ interface_ip_add_route(struct interface *iface, struct blob_attr *attr, bool v6)
 		route->flags |= DEVROUTE_METRIC;
 	}
 
-	if ((cur = tb[ROUTE_MTU]) != NULL)
+	if ((cur = tb[ROUTE_MTU]) != NULL) {
 		route->mtu = blobmsg_get_u32(cur);
+		route->flags |= DEVROUTE_MTU;
+	}
 
 	vlist_add(&ip->route, &route->node, &route->flags);
 	return;
@@ -258,6 +270,7 @@ interface_handle_subnet_route(struct interface *iface, struct device_addr *addr,
 	struct device *dev = iface->l3_dev.dev;
 	struct device_route route;
 
+	memset(&route, 0, sizeof(route));
 	route.iface = iface;
 	route.flags = addr->flags;
 	route.mask = addr->mask;
@@ -417,6 +430,9 @@ interface_add_dns_server(struct interface_ip_settings *ip, const char *str)
 	struct dns_server *s;
 
 	s = calloc(1, sizeof(*s));
+	if (!s)
+		return;
+
 	s->af = AF_INET;
 	if (inet_pton(s->af, str, &s->addr.in))
 		goto add;
@@ -601,6 +617,7 @@ interface_ip_update_complete(struct interface_ip_settings *ip)
 	vlist_simple_flush(&ip->dns_search);
 	vlist_flush(&ip->route);
 	vlist_flush(&ip->addr);
+	interface_write_resolv_conf();
 }
 
 void