ROUTE_TARGET,
ROUTE_MASK,
ROUTE_GATEWAY,
- ROUTE_DEVICE,
ROUTE_METRIC,
ROUTE_MTU,
- __ROUTE_LAST
+ __ROUTE_MAX
};
-static const struct blobmsg_policy route_attr[__ROUTE_LAST] = {
+static const struct blobmsg_policy route_attr[__ROUTE_MAX] = {
[ROUTE_INTERFACE] = { .name = "interface", .type = BLOBMSG_TYPE_STRING },
[ROUTE_TARGET] = { .name = "target", .type = BLOBMSG_TYPE_STRING },
[ROUTE_MASK] = { .name = "netmask", .type = BLOBMSG_TYPE_STRING },
[ROUTE_GATEWAY] = { .name = "gateway", .type = BLOBMSG_TYPE_STRING },
- [ROUTE_DEVICE] = { .name = "device", .type = BLOBMSG_TYPE_STRING },
[ROUTE_METRIC] = { .name = "metric", .type = BLOBMSG_TYPE_INT32 },
[ROUTE_MTU] = { .name = "mtu", .type = BLOBMSG_TYPE_INT32 },
};
+const struct config_param_list route_attr_list = {
+ .n_params = __ROUTE_MAX,
+ .params = route_attr,
+};
+
void
interface_ip_add_route(struct interface *iface, struct blob_attr *attr, bool v6)
{
struct interface_ip_settings *ip;
- struct blob_attr *tb[__ROUTE_LAST], *cur;
+ struct blob_attr *tb[__ROUTE_MAX], *cur;
struct device_route *route;
int af = v6 ? AF_INET6 : AF_INET;
- bool config = false;
- blobmsg_parse(route_attr, __ROUTE_LAST, tb, blobmsg_data(attr), blobmsg_data_len(attr));
-
- if (!tb[ROUTE_GATEWAY] && !tb[ROUTE_DEVICE])
- return;
+ blobmsg_parse(route_attr, __ROUTE_MAX, tb, blobmsg_data(attr), blobmsg_data_len(attr));
if (!iface) {
if ((cur = tb[ROUTE_INTERFACE]) == NULL)
return;
ip = &iface->config_ip;
- config = true;
} else {
ip = &iface->proto_ip;
}
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);
}
}
- 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);
- if (!config && (cur = tb[ROUTE_DEVICE]) != NULL)
- route->device = device_get(blobmsg_data(cur), true);
-
- vlist_add(&ip->route, &route->node);
+ vlist_add(&ip->route, &route->node, &route->mask);
return;
error:
struct interface_ip_settings *ip;
struct interface *iface;
struct device *dev;
- struct device_addr *addr;
+ struct device_addr *a_new = NULL, *a_old = NULL;
+ bool keep = false;
ip = container_of(tree, struct interface_ip_settings, addr);
iface = ip->iface;
dev = iface->l3_dev->dev;
+ if (node_new) {
+ a_new = container_of(node_new, struct device_addr, node);
+
+ if ((a_new->flags & DEVADDR_FAMILY) == DEVADDR_INET4 &&
+ !a_new->broadcast) {
+
+ uint32_t mask = ~0;
+ uint32_t *a = (uint32_t *) &a_new->addr;
+
+ mask >>= a_new->mask;
+ a_new->broadcast = *a | mask;
+ }
+ }
+
+ if (node_old)
+ a_old = container_of(node_old, struct device_addr, node);
+
+ if (a_new && a_old) {
+ keep = true;
+
+ if (a_old->flags != a_new->flags)
+ keep = false;
+
+ if ((a_new->flags & DEVADDR_FAMILY) == DEVADDR_INET4 &&
+ a_new->broadcast != a_old->broadcast)
+ keep = false;
+ }
+
if (node_old) {
- addr = container_of(node_old, struct device_addr, node);
- if (!(addr->flags & DEVADDR_EXTERNAL) && addr->enabled)
- system_del_address(dev, addr);
- free(addr);
+ if (!(a_old->flags & DEVADDR_EXTERNAL) && a_old->enabled && !keep)
+ system_del_address(dev, a_old);
+ free(a_old);
}
if (node_new) {
- addr = container_of(node_new, struct device_addr, node);
- if (!(addr->flags & DEVADDR_EXTERNAL))
- system_add_address(dev, addr);
- addr->enabled = true;
+ if (!(a_new->flags & DEVADDR_EXTERNAL) && !keep)
+ system_add_address(dev, a_new);
+ a_new->enabled = true;
}
}
+static bool
+enable_route(struct interface_ip_settings *ip, struct device_route *route)
+{
+ if (ip->no_defaultroute && !route->mask)
+ return false;
+
+ return true;
+}
+
static void
interface_update_proto_route(struct vlist_tree *tree,
struct vlist_node *node_new,
struct interface_ip_settings *ip;
struct interface *iface;
struct device *dev;
- struct device_route *route;
+ struct device_route *route_old, *route_new;
+ bool keep = false;
ip = container_of(tree, struct interface_ip_settings, route);
iface = ip->iface;
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);
+
+ if (node_old && node_new)
+ keep = !memcmp(&route_old->nexthop, &route_new->nexthop, sizeof(route_old->nexthop));
+
if (node_old) {
- route = container_of(node_old, struct device_route, node);
- if (!(route->flags & DEVADDR_EXTERNAL) && route->enabled)
- system_del_route(dev, route);
- free(route);
+ if (!(route_old->flags & DEVADDR_EXTERNAL) && route_old->enabled && !keep)
+ system_del_route(dev, route_old);
+ free(route_old);
}
if (node_new) {
- route = container_of(node_new, struct device_route, node);
- if (!(route->flags & DEVADDR_EXTERNAL))
- system_add_route(dev, route);
- route->enabled = true;
+ bool _enabled = enable_route(ip, route_new);
+
+ if (!(route_new->flags & DEVADDR_EXTERNAL) && !keep && _enabled)
+ system_add_route(dev, route_new);
+
+ route_new->enabled = _enabled;
}
}
add:
D(INTERFACE, "Add IPv%c DNS server: %s\n",
s->af == AF_INET6 ? '6' : '4', str);
- list_add_tail(&s->list, &ip->dns_servers);
+ vlist_simple_add(&ip->dns_servers, &s->node);
}
void
D(INTERFACE, "Add DNS search domain: %s\n", str);
memcpy(s->name, str, len);
- list_add_tail(&s->list, &ip->dns_search);
+ vlist_simple_add(&ip->dns_search, &s->node);
}
void
}
static void
-interface_clear_dns_servers(struct interface_ip_settings *ip)
+write_resolv_conf_entries(FILE *f, struct interface_ip_settings *ip)
{
- struct dns_server *s, *tmp;
+ struct dns_server *s;
+ struct dns_search_domain *d;
+ const char *str;
+ char buf[32];
- list_for_each_entry_safe(s, tmp, &ip->dns_servers, list) {
- list_del(&s->list);
- free(s);
- }
-}
+ vlist_simple_for_each_element(&ip->dns_servers, s, node) {
+ str = inet_ntop(s->af, &s->addr, buf, sizeof(buf));
+ if (!str)
+ continue;
-static void
-interface_clear_dns_search(struct interface_ip_settings *ip)
-{
- struct dns_search_domain *s, *tmp;
+ fprintf(f, "nameserver %s\n", str);
+ }
- list_for_each_entry_safe(s, tmp, &ip->dns_search, list) {
- list_del(&s->list);
- free(s);
+ vlist_simple_for_each_element(&ip->dns_search, d, node) {
+ fprintf(f, "search %s\n", d->name);
}
}
interface_write_resolv_conf(void)
{
struct interface *iface;
- struct dns_server *s;
- struct dns_search_domain *d;
char *path = alloca(strlen(resolv_conf) + 5);
- const char *str;
- char buf[32];
FILE *f;
sprintf(path, "%s.tmp", resolv_conf);
if (iface->state != IFS_UP)
continue;
- if (list_empty(&iface->proto_ip.dns_search) &&
- list_empty(&iface->proto_ip.dns_servers))
+ if (vlist_simple_empty(&iface->proto_ip.dns_search) &&
+ vlist_simple_empty(&iface->proto_ip.dns_servers) &&
+ vlist_simple_empty(&iface->config_ip.dns_search) &&
+ vlist_simple_empty(&iface->config_ip.dns_servers))
continue;
fprintf(f, "# Interface %s\n", iface->name);
- list_for_each_entry(s, &iface->proto_ip.dns_servers, list) {
- str = inet_ntop(s->af, &s->addr, buf, sizeof(buf));
- if (!str)
- continue;
-
- fprintf(f, "nameserver %s\n", str);
- }
-
- list_for_each_entry(d, &iface->proto_ip.dns_search, list) {
- fprintf(f, "search %s\n", d->name);
- }
+ write_resolv_conf_entries(f, &iface->config_ip);
+ write_resolv_conf_entries(f, &iface->proto_ip);
}
fclose(f);
if (rename(path, resolv_conf) < 0) {
}
vlist_for_each_element(&ip->route, route, node) {
- if (route->enabled == enabled)
+ bool _enabled = enabled;
+
+ if (!enable_route(ip, route))
+ _enabled = false;
+
+ if (route->enabled == _enabled)
continue;
- if (enabled)
+ if (_enabled)
system_add_route(dev, route);
else
system_del_route(dev, route);
- route->enabled = enabled;
+ route->enabled = _enabled;
}
}
void
interface_ip_update_start(struct interface_ip_settings *ip)
{
- interface_clear_dns_servers(ip);
- interface_clear_dns_search(ip);
+ vlist_simple_update(&ip->dns_servers);
+ vlist_simple_update(&ip->dns_search);
vlist_update(&ip->route);
vlist_update(&ip->addr);
}
void
interface_ip_update_complete(struct interface_ip_settings *ip)
{
+ vlist_simple_flush(&ip->dns_servers);
+ vlist_simple_flush(&ip->dns_search);
vlist_flush(&ip->route);
vlist_flush(&ip->addr);
}
void
interface_ip_flush(struct interface_ip_settings *ip)
{
- interface_clear_dns_servers(ip);
- interface_clear_dns_search(ip);
+ vlist_simple_flush_all(&ip->dns_servers);
+ vlist_simple_flush_all(&ip->dns_search);
vlist_flush_all(&ip->route);
vlist_flush_all(&ip->addr);
}
{
ip->iface = iface;
ip->enabled = true;
- INIT_LIST_HEAD(&ip->dns_search);
- INIT_LIST_HEAD(&ip->dns_servers);
- vlist_init(&ip->route, route_cmp, interface_update_proto_route,
- struct device_route, node, mask);
- vlist_init(&ip->addr, addr_cmp, interface_update_proto_addr,
- struct device_addr, node, mask);
+ vlist_simple_init(&ip->dns_search, struct dns_search_domain, node);
+ vlist_simple_init(&ip->dns_servers, struct dns_server, node);
+ vlist_init(&ip->route, route_cmp, interface_update_proto_route);
+ vlist_init(&ip->addr, addr_cmp, interface_update_proto_addr);
}
projects / project / netifd.git / blobdiff