ROUTE_GATEWAY,
ROUTE_METRIC,
ROUTE_MTU,
+ ROUTE_VALID,
__ROUTE_MAX
};
[ROUTE_GATEWAY] = { .name = "gateway", .type = BLOBMSG_TYPE_STRING },
[ROUTE_METRIC] = { .name = "metric", .type = BLOBMSG_TYPE_INT32 },
[ROUTE_MTU] = { .name = "mtu", .type = BLOBMSG_TYPE_INT32 },
+ [ROUTE_VALID] = { .name = "valid", .type = BLOBMSG_TYPE_INT32 },
};
const struct config_param_list route_attr_list = {
.params = route_attr,
};
+
+struct list_head prefixes = LIST_HEAD_INIT(prefixes);
+static struct device_prefix *ula_prefix = NULL;
+static struct uloop_timeout valid_until_timeout;
+
+
static void
clear_if_addr(union if_addr *a, int mask)
{
{
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;
+ }
+
+ if ((cur = tb[ROUTE_VALID]) != NULL)
+ route->valid_until = system_get_rtime() + blobmsg_get_u32(cur);
vlist_add(&ip->route, &route->node, &route->flags);
return;
offsetof(struct device_route, flags));
}
+static int
+prefix_cmp(const void *k1, const void *k2, void *ptr)
+{
+ return memcmp(k1, k2, sizeof(struct device_prefix) -
+ offsetof(struct device_prefix, addr));
+}
+
+static void
+interface_handle_subnet_route(struct interface *iface, struct device_addr *addr, bool add)
+{
+ 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;
+ memcpy(&route.addr, &addr->addr, sizeof(route.addr));
+ clear_if_addr(&route.addr, route.mask);
+
+ if (add) {
+ route.flags |= DEVADDR_KERNEL;
+ system_del_route(dev, &route);
+
+ if (!(addr->flags & DEVADDR_OFFLINK)) {
+ route.flags &= ~DEVADDR_KERNEL;
+ route.metric = iface->metric;
+ system_add_route(dev, &route);
+ }
+ } else {
+ if (!(addr->flags & DEVADDR_OFFLINK))
+ system_del_route(dev, &route);
+ }
+}
+
static void
interface_update_proto_addr(struct vlist_tree *tree,
struct vlist_node *node_new,
struct device *dev;
struct device_addr *a_new = NULL, *a_old = NULL;
bool keep = false;
- struct device_route *route;
ip = container_of(tree, struct interface_ip_settings, addr);
iface = ip->iface;
uint32_t *a = (uint32_t *) &a_new->addr;
mask >>= a_new->mask;
- a_new->broadcast = *a | mask;
+ a_new->broadcast = *a | htonl(mask);
}
}
if (a_new && a_old) {
keep = true;
- if (a_old->flags != a_new->flags)
+ if (a_old->flags != a_new->flags ||
+ a_old->valid_until != a_new->valid_until ||
+ a_old->preferred_until != a_new->preferred_until)
keep = false;
if ((a_new->flags & DEVADDR_FAMILY) == DEVADDR_INET4 &&
}
if (node_old) {
- if (!(a_old->flags & DEVADDR_EXTERNAL) && a_old->enabled && !keep)
+ if (!(a_old->flags & DEVADDR_EXTERNAL) && a_old->enabled && !keep) {
+ interface_handle_subnet_route(iface, a_old, false);
system_del_address(dev, a_old);
+ }
free(a_old);
}
a_new->enabled = true;
if (!(a_new->flags & DEVADDR_EXTERNAL) && !keep) {
system_add_address(dev, a_new);
- if (iface->metric)
- goto replace_route;
+ if ((a_new->flags & DEVADDR_OFFLINK) || iface->metric)
+ interface_handle_subnet_route(iface, a_new, true);
}
}
- return;
-
-replace_route:
- route = calloc(1, sizeof(*route));
- route->iface = iface;
- route->flags = a_new->flags | DEVADDR_KERNEL;
- route->mask = a_new->mask;
- memcpy(&route->addr, &a_new->addr, sizeof(route->addr));
- clear_if_addr(&route->addr, route->mask);
-
- system_del_route(dev, route);
-
- route->flags &= ~DEVADDR_KERNEL;
- route->metric = iface->metric;
- vlist_add(&ip->route, &route->node, &route->flags);
}
static bool
system_add_route(dev, route_new);
}
+
+static void
+interface_set_prefix_address(struct interface *iface, bool add,
+ struct device_prefix_assignment *assignment)
+{
+ struct interface *uplink = assignment->prefix->iface;
+ if (!iface->l3_dev.dev)
+ return;
+
+ struct device *l3_downlink = iface->l3_dev.dev;
+
+ struct device_addr addr;
+ memset(&addr, 0, sizeof(addr));
+ addr.addr.in6 = assignment->addr;
+ addr.mask = assignment->length;
+ addr.flags = DEVADDR_INET6;
+ addr.preferred_until = assignment->prefix->preferred_until;
+ addr.valid_until = assignment->prefix->valid_until;
+
+ if (!add) {
+ if (assignment->enabled) {
+ time_t now = system_get_rtime();
+ addr.preferred_until = now;
+ if (!addr.valid_until || addr.valid_until - now > 7200)
+ addr.valid_until = now + 7200;
+ system_add_address(l3_downlink, &addr);
+ }
+ } else {
+ system_add_address(l3_downlink, &addr);
+
+ if (uplink && uplink->l3_dev.dev) {
+ int mtu = system_update_ipv6_mtu(
+ uplink->l3_dev.dev, 0);
+ if (mtu > 0)
+ system_update_ipv6_mtu(l3_downlink, mtu);
+ }
+ }
+ assignment->enabled = add;
+}
+
+
+static void
+interface_update_prefix_assignments(struct vlist_tree *tree,
+ struct vlist_node *node_new,
+ struct vlist_node *node_old)
+{
+ struct device_prefix_assignment *old, *new;
+ old = container_of(node_old, struct device_prefix_assignment, node);
+ new = container_of(node_new, struct device_prefix_assignment, node);
+
+ // Assignments persist across interface reloads etc.
+ // so use indirection to avoid dangling pointers
+ struct interface *iface = vlist_find(&interfaces,
+ (node_new) ? new->name : old->name, iface, node);
+
+ if (node_old && node_new) {
+ new->addr = old->addr;
+ new->length = old->length;
+ } else if (node_old) {
+ if (iface)
+ interface_set_prefix_address(iface, false, old);
+ free(old);
+ } else if (node_new) {
+ struct device_prefix *prefix = new->prefix;
+ uint64_t want = 1ULL << (64 - new->length);
+ prefix->avail &= ~(want - 1);
+ prefix->avail -= want;
+
+ // Invert assignment
+ uint64_t assigned = ~prefix->avail;
+ assigned &= (1ULL << (64 - prefix->length)) - 1;
+ assigned &= ~(want - 1);
+
+ // Assignment
+ new->addr = prefix->addr;
+ new->addr.s6_addr32[0] |=
+ htonl(assigned >> 32);
+ new->addr.s6_addr32[1] |=
+ htonl(assigned & 0xffffffffU);
+ new->addr.s6_addr[15] += 1;
+ }
+
+ if (node_new && (iface->state == IFS_UP || iface->state == IFS_SETUP))
+ interface_set_prefix_address(iface, true, new);
+}
+
+
+void
+interface_ip_set_prefix_assignment(struct device_prefix *prefix,
+ struct interface *iface, uint8_t length)
+{
+ struct device_prefix_assignment *assignment;
+
+ if (!length || length > 64) {
+ assignment = vlist_find(prefix->assignments, iface->name, assignment, node);
+ if (assignment)
+ interface_set_prefix_address(iface, false, assignment);
+ } else {
+ uint64_t want = 1ULL << (64 - length);
+ char *name;
+
+ if (prefix->avail < want && prefix->avail > 0) {
+ do {
+ want = 1ULL << (64 - ++length);
+ } while (want > prefix->avail);
+ }
+
+ if (prefix->avail < want)
+ return;
+
+ assignment = calloc_a(sizeof(*assignment),
+ &name, strlen(iface->name) + 1);
+ assignment->prefix = prefix;
+ assignment->length = length;
+ assignment->name = strcpy(name, iface->name);
+
+ vlist_add(prefix->assignments, &assignment->node, assignment->name);
+ }
+}
+
+static void
+interface_update_prefix(struct vlist_tree *tree,
+ struct vlist_node *node_new,
+ struct vlist_node *node_old)
+{
+ struct device_prefix *prefix_old, *prefix_new;
+ prefix_old = container_of(node_old, struct device_prefix, node);
+ prefix_new = container_of(node_new, struct device_prefix, node);
+
+ struct device_route route;
+ memset(&route, 0, sizeof(route));
+ route.flags = DEVADDR_INET6;
+ route.metric = INT32_MAX;
+ route.mask = (node_new) ? prefix_new->length : prefix_old->length;
+ route.addr.in6 = (node_new) ? prefix_new->addr : prefix_old->addr;
+
+ if (node_old && node_new) {
+ prefix_new->avail = prefix_old->avail;
+ prefix_new->assignments = prefix_old->assignments;
+ prefix_old->assignments = NULL;
+
+ // Update all assignments
+ struct device_prefix_assignment *assignment;
+ struct vlist_tree *assignments = prefix_new->assignments;
+ vlist_for_each_element(assignments, assignment, node) {
+ assignment->prefix = prefix_new;
+ assignments->update(assignments,
+ &assignment->node, &assignment->node);
+ }
+ } else if (node_new) {
+ prefix_new->avail = 1ULL << (64 - prefix_new->length);
+ prefix_new->assignments = calloc(1, sizeof(*prefix_new->assignments));
+ vlist_init(prefix_new->assignments, avl_strcmp,
+ interface_update_prefix_assignments);
+
+ // Create initial assignments for interfaces
+ struct interface *iface;
+ vlist_for_each_element(&interfaces, iface, node)
+ interface_ip_set_prefix_assignment(prefix_new, iface,
+ iface->proto_ip.assignment_length);
+
+ // Set null-route to avoid routing loops
+ system_add_route(NULL, &route);
+ }
+
+ if (node_old) {
+ // Remove null-route
+ system_del_route(NULL, &route);
+
+ list_del(&prefix_old->head);
+
+ if (prefix_old->assignments) {
+ vlist_flush_all(prefix_old->assignments);
+ free(prefix_old->assignments);
+ }
+ free(prefix_old);
+ }
+
+ if (node_new)
+ list_add(&prefix_new->head, &prefixes);
+}
+
+struct device_prefix*
+interface_ip_add_device_prefix(struct interface *iface, struct in6_addr *addr,
+ uint8_t length, time_t valid_until, time_t preferred_until)
+{
+ struct device_prefix *prefix = calloc(1, sizeof(*prefix));
+ prefix->length = length;
+ prefix->addr = *addr;
+ prefix->preferred_until = preferred_until;
+ prefix->valid_until = valid_until;
+ prefix->iface = iface;
+
+ if (iface)
+ vlist_add(&iface->proto_ip.prefix, &prefix->node, &prefix->addr);
+ else
+ interface_update_prefix(NULL, &prefix->node, NULL);
+
+ return prefix;
+}
+
+void
+interface_ip_set_ula_prefix(const char *prefix)
+{
+ char buf[INET6_ADDRSTRLEN + 4] = {0}, *saveptr;
+ if (prefix)
+ strncpy(buf, prefix, sizeof(buf) - 1);
+ char *prefixaddr = strtok_r(buf, "/", &saveptr);
+
+ struct in6_addr addr;
+ if (!prefixaddr || inet_pton(AF_INET6, prefixaddr, &addr) < 1) {
+ if (ula_prefix) {
+ interface_update_prefix(NULL, NULL, &ula_prefix->node);
+ ula_prefix = NULL;
+ }
+ return;
+ }
+
+ int length;
+ char *prefixlen = strtok_r(NULL, ",", &saveptr);
+ if (!prefixlen || (length = atoi(prefixlen)) < 1 || length > 64)
+ return;
+
+ if (!ula_prefix || !IN6_ARE_ADDR_EQUAL(&addr, &ula_prefix->addr) ||
+ ula_prefix->length != length) {
+ if (ula_prefix)
+ interface_update_prefix(NULL, NULL, &ula_prefix->node);
+
+ ula_prefix = interface_ip_add_device_prefix(NULL, &addr, length, 0, 0);
+ }
+}
+
void
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;
struct interface *iface;
char *path = alloca(strlen(resolv_conf) + 5);
FILE *f;
+ uint32_t crcold, crcnew;
sprintf(path, "%s.tmp", resolv_conf);
unlink(path);
- f = fopen(path, "w");
+ f = fopen(path, "w+");
if (!f) {
D(INTERFACE, "Failed to open %s for writing\n", path);
return;
if (!iface->proto_ip.no_dns)
write_resolv_conf_entries(f, &iface->proto_ip);
}
+ fflush(f);
+ rewind(f);
+ crcnew = crc32_file(f);
fclose(f);
- if (rename(path, resolv_conf) < 0) {
+
+ crcold = crcnew + 1;
+ f = fopen(resolv_conf, "r");
+ if (f) {
+ crcold = crc32_file(f);
+ fclose(f);
+ }
+
+ if (crcold == crcnew) {
+ unlink(path);
+ } else if (rename(path, resolv_conf) < 0) {
D(INTERFACE, "Failed to replace %s\n", resolv_conf);
unlink(path);
}
}
vlist_update(&ip->route);
vlist_update(&ip->addr);
+ vlist_update(&ip->prefix);
}
void
vlist_simple_flush(&ip->dns_search);
vlist_flush(&ip->route);
vlist_flush(&ip->addr);
+ vlist_flush(&ip->prefix);
+ interface_write_resolv_conf();
}
void
vlist_simple_flush_all(&ip->dns_search);
vlist_flush_all(&ip->route);
vlist_flush_all(&ip->addr);
+ vlist_flush_all(&ip->prefix);
}
static void
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);
+ vlist_init(&ip->prefix, prefix_cmp, interface_update_prefix);
}
void
__interface_ip_init(&iface->proto_ip, iface);
__interface_ip_init(&iface->config_ip, iface);
vlist_init(&iface->host_routes, route_cmp, interface_update_host_route);
+
+}
+
+static void
+interface_ip_valid_until_handler(struct uloop_timeout *t)
+{
+ time_t now = system_get_rtime();
+ struct interface *iface;
+ vlist_for_each_element(&interfaces, iface, node) {
+ if (iface->state != IFS_UP)
+ continue;
+
+ struct device_addr *addr, *addrp;
+ struct device_route *route, *routep;
+ struct device_prefix *pref, *prefp;
+
+ vlist_for_each_element_safe(&iface->proto_ip.addr, addr, node, addrp)
+ if (addr->valid_until && addr->valid_until < now)
+ vlist_delete(&iface->proto_ip.addr, &addr->node);
+
+ vlist_for_each_element_safe(&iface->proto_ip.route, route, node, routep)
+ if (route->valid_until && route->valid_until < now)
+ vlist_delete(&iface->proto_ip.route, &route->node);
+
+ vlist_for_each_element_safe(&iface->proto_ip.prefix, pref, node, prefp)
+ if (pref->valid_until && pref->valid_until < now)
+ vlist_delete(&iface->proto_ip.prefix, &pref->node);
+
+ }
+
+ uloop_timeout_set(t, 1000);
+}
+
+static void __init
+interface_ip_init_worker(void)
+{
+ valid_until_timeout.cb = interface_ip_valid_until_handler;
+ uloop_timeout_set(&valid_until_timeout, 1000);
}