From: Felix Fietkau Date: Mon, 18 Jun 2012 21:19:27 +0000 (+0200) Subject: add support for defaultroute "host" dependencies X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=commitdiff_plain;h=88ae5a835d1c3184410f3023fc637d02bd58611e add support for defaultroute "host" dependencies --- diff --git a/interface-ip.c b/interface-ip.c index 6699d2e..d8d8606 100644 --- a/interface-ip.c +++ b/interface-ip.c @@ -141,6 +141,8 @@ 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) @@ -148,7 +150,10 @@ interface_ip_add_target_route(union if_addr *addr, bool v6) 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 */ @@ -172,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; }