{
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 */
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));
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;
}
}
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;
}
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;
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;
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;
vlist_simple_flush(&ip->dns_search);
vlist_flush(&ip->route);
vlist_flush(&ip->addr);
+ interface_write_resolv_conf();
}
void