if (!route)
return;
+ route->flags = v6 ? DEVADDR_INET6 : DEVADDR_INET4;
route->mask = v6 ? 128 : 32;
if ((cur = tb[ROUTE_MASK]) != NULL) {
route->mask = parse_netmask_string(blobmsg_data(cur), 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)
+ if ((cur = tb[ROUTE_METRIC]) != NULL) {
route->metric = blobmsg_get_u32(cur);
+ route->flags |= DEVROUTE_METRIC;
+ }
if ((cur = tb[ROUTE_MTU]) != NULL)
route->mtu = blobmsg_get_u32(cur);
ip = container_of(tree, struct interface_ip_settings, addr);
iface = ip->iface;
- dev = iface->l3_dev->dev;
+ dev = iface->l3_dev.dev;
if (node_new) {
a_new = container_of(node_new, struct device_addr, node);
ip = container_of(tree, struct interface_ip_settings, route);
iface = ip->iface;
- dev = iface->l3_dev->dev;
+ 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);
struct device *dev;
ip->enabled = enabled;
- dev = ip->iface->l3_dev->dev;
+ dev = ip->iface->l3_dev.dev;
if (!dev)
return;
if (route->enabled == _enabled)
continue;
- if (_enabled)
+ if (_enabled) {
+ if (!(route->flags & DEVROUTE_METRIC))
+ route->metric = ip->iface->metric;
+
system_add_route(dev, route);
- else
+ } else
system_del_route(dev, route);
route->enabled = _enabled;
}