/*
* netifd - network interface daemon
* Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2012 Steven Barth <steven@midlink.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2
#include <stdio.h>
#include <unistd.h>
+#include <limits.h>
#include <arpa/inet.h>
#include "netifd.h"
ROUTE_METRIC,
ROUTE_MTU,
ROUTE_VALID,
+ ROUTE_TABLE,
+ ROUTE_SOURCE,
__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_TABLE] = { .name = "table", .type = BLOBMSG_TYPE_STRING },
[ROUTE_VALID] = { .name = "valid", .type = BLOBMSG_TYPE_INT32 },
+ [ROUTE_SOURCE] = { .name = "source", .type = BLOBMSG_TYPE_STRING },
};
-const struct config_param_list route_attr_list = {
+const struct uci_blob_param_list route_attr_list = {
.n_params = __ROUTE_MAX,
.params = route_attr,
};
struct list_head prefixes = LIST_HEAD_INIT(prefixes);
+static struct list_head source_tables = LIST_HEAD_INIT(source_tables);
static struct device_prefix *ula_prefix = NULL;
static struct uloop_timeout valid_until_timeout;
return !memcmp(p1, p2, sizeof(*p1));
}
+static int set_ip_source_policy(bool add, bool v6, unsigned int priority,
+ const union if_addr *addr, uint8_t mask, unsigned int table,
+ struct interface *in_iface, const char *action)
+{
+ struct iprule rule = {
+ .flags = IPRULE_PRIORITY,
+ .priority = priority
+ };
+
+ if (addr) {
+ rule.flags |= IPRULE_SRC;
+ rule.src_addr = *addr;
+ rule.src_mask = mask;
+ }
+
+ if (table) {
+ rule.flags |= IPRULE_LOOKUP;
+ rule.lookup = table;
+
+ if (!rule.lookup)
+ return 0;
+ } else if (action) {
+ rule.flags |= IPRULE_ACTION;
+ system_resolve_iprule_action(action, &rule.action);
+ }
+
+ if (in_iface && in_iface->l3_dev.dev) {
+ rule.flags |= IPRULE_IN;
+ strcpy(rule.in_dev, in_iface->l3_dev.dev->ifname);
+ }
+
+ rule.flags |= (v6) ? IPRULE_INET6 : IPRULE_INET4;
+
+ return (add) ? system_add_iprule(&rule) : system_del_iprule(&rule);
+}
+
+static int set_ip_lo_policy(bool add, bool v6, struct interface *iface)
+{
+ struct iprule rule = {
+ .flags = IPRULE_IN | IPRULE_LOOKUP | IPRULE_PRIORITY,
+ .priority = IPRULE_PRIORITY_NW + iface->l3_dev.dev->ifindex,
+ .lookup = (v6) ? iface->ip6table : iface->ip4table,
+ .in_dev = "lo"
+ };
+
+ if (!rule.lookup)
+ return 0;
+
+ rule.flags |= (v6) ? IPRULE_INET6 : IPRULE_INET4;
+
+ return (add) ? system_add_iprule(&rule) : system_del_iprule(&rule);
+}
+
static bool
__find_ip_addr_target(struct interface_ip_settings *ip, union if_addr *a, bool v6)
{
if (v6 != ((addr->flags & DEVADDR_FAMILY) == DEVADDR_INET6))
continue;
- if (!match_if_addr(&addr->addr, a, addr->mask))
+ // Handle offlink addresses correctly
+ unsigned int mask = addr->mask;
+ if ((addr->flags & DEVADDR_FAMILY) == DEVADDR_INET6 &&
+ (addr->flags & DEVADDR_OFFLINK))
+ mask = 128;
+
+ if (!match_if_addr(&addr->addr, a, mask))
continue;
return true;
if (!match_if_addr(&route->addr, a, route->mask))
continue;
+ if (route->flags & DEVROUTE_TABLE)
+ continue;
+
if (!*res || route->mask < (*res)->mask)
*res = route;
}
}
+static struct device_source_table*
+find_source_table(const struct device_route *route)
+{
+ struct device_source_table key = {
+ .v6 = (route->flags & DEVADDR_FAMILY) == DEVADDR_INET6,
+ .addr = route->source,
+ .mask = route->sourcemask
+ };
+ struct device_source_table *c;
+ list_for_each_entry(c, &source_tables, head)
+ if (!memcmp(&c->v6, &key.v6, sizeof(key) -
+ offsetof(struct device_source_table, v6)))
+ return c;
+ return NULL;
+}
+
+static uint32_t
+get_source_table(const struct device_route *route)
+{
+ if (route->table || route->sourcemask == 0)
+ return route->table;
+
+ struct device_source_table *tbl = find_source_table(route);
+
+ if (!tbl) {
+ tbl = calloc(1, sizeof(*tbl));
+ tbl->addr = route->source;
+ tbl->mask = route->sourcemask;
+ tbl->v6 = (route->flags & DEVADDR_FAMILY) == DEVADDR_INET6;
+ tbl->table = IPRULE_PRIORITY_SOURCE | (((~tbl->mask) & 0x7f) << 20);
+
+ struct list_head *before = NULL;
+ struct device_source_table *c;
+ list_for_each_entry(c, &source_tables, head) {
+ if (c->table > tbl->table) {
+ before = &c->head;
+ break;
+ } else if (c->table == tbl->table) {
+ ++tbl->table;
+ }
+ }
+
+ if (!before)
+ before = &source_tables;
+
+ list_add_tail(&tbl->head, before);
+ set_ip_source_policy(true, tbl->v6, tbl->table, &tbl->addr,
+ tbl->mask, tbl->table, NULL, NULL);
+ }
+
+ ++tbl->refcount;
+ return tbl->table;
+}
+
+static void
+put_source_table(const struct device_route *route)
+{
+ struct device_source_table *tbl = find_source_table(route);
+ if (tbl && tbl->table == route->table && --tbl->refcount == 0) {
+ set_ip_source_policy(false, tbl->v6, tbl->table, &tbl->addr,
+ tbl->mask, tbl->table, NULL, NULL);
+ list_del(&tbl->head);
+ free(tbl);
+ }
+}
+
static bool
interface_ip_find_addr_target(struct interface *iface, union if_addr *a, bool v6)
{
}
struct interface *
-interface_ip_add_target_route(union if_addr *addr, bool v6)
+interface_ip_add_target_route(union if_addr *addr, bool v6, struct interface *iface)
{
- struct interface *iface;
struct device_route *route, *r_next = NULL;
bool defaultroute_target = false;
int addrsize = v6 ? sizeof(addr->in6) : sizeof(addr->in);
else
memcpy(&route->addr, addr, addrsize);
- vlist_for_each_element(&interfaces, iface, node) {
+ if (iface) {
/* look for locally addressable target first */
if (interface_ip_find_addr_target(iface, addr, v6))
goto done;
/* do not stop at the first route, let the lookup compare
* masks to find the best match */
interface_ip_find_route_target(iface, addr, v6, &r_next);
+ } else {
+ vlist_for_each_element(&interfaces, iface, node) {
+ /* look for locally addressable target first */
+ if (interface_ip_find_addr_target(iface, addr, v6))
+ goto done;
+
+ /* do not stop at the first route, let the lookup compare
+ * masks to find the best match */
+ interface_ip_find_route_target(iface, addr, v6, &r_next);
+ }
}
if (!r_next) {
memcpy(&route->nexthop, &r_next->nexthop, sizeof(route->nexthop));
route->mtu = r_next->mtu;
route->metric = r_next->metric;
+ route->table = r_next->table;
done:
route->iface = iface;
if (defaultroute_target)
free(route);
else
- vlist_add(&iface->host_routes, &route->node, &route->flags);
+ vlist_add(&iface->host_routes, &route->node, route);
return iface;
}
struct blob_attr *tb[__ROUTE_MAX], *cur;
struct device_route *route;
int af = v6 ? AF_INET6 : AF_INET;
+ bool is_proto_route = !!iface;
blobmsg_parse(route_attr, __ROUTE_MAX, tb, blobmsg_data(attr), blobmsg_data_len(attr));
route->flags |= DEVROUTE_MTU;
}
- if ((cur = tb[ROUTE_VALID]) != NULL)
- route->valid_until = system_get_rtime() + blobmsg_get_u32(cur);
+ // Use source-based routing
+ if ((cur = tb[ROUTE_SOURCE]) != NULL) {
+ char *saveptr, *source = alloca(blobmsg_data_len(cur));
+ memcpy(source, blobmsg_data(cur), blobmsg_data_len(cur));
- vlist_add(&ip->route, &route->node, &route->flags);
+ const char *addr = strtok_r(source, "/", &saveptr);
+ const char *mask = strtok_r(NULL, "/", &saveptr);
+
+ if (inet_pton(af, addr, &route->source) < 1) {
+ DPRINTF("Failed to parse route source: %s\n", addr);
+ goto error;
+ }
+
+ route->sourcemask = atoi(mask);
+ } else if (is_proto_route) {
+ route->table = (v6) ? iface->ip6table : iface->ip4table;
+ route->flags |= DEVROUTE_SRCTABLE;
+ }
+
+ if ((cur = tb[ROUTE_TABLE]) != NULL) {
+ if (!system_resolve_rt_table(blobmsg_data(cur), &route->table)) {
+ DPRINTF("Failed to resolve routing table: %s\n", (char *) blobmsg_data(cur));
+ goto error;
+ }
+
+ if (route->table)
+ route->flags |= DEVROUTE_TABLE;
+ }
+
+ if ((cur = tb[ROUTE_VALID]) != NULL) {
+ int64_t valid = blobmsg_get_u32(cur);
+ int64_t valid_until = valid + (int64_t)system_get_rtime();
+ if (valid_until <= LONG_MAX && valid != 0xffffffffLL) // Catch overflow
+ route->valid_until = valid_until;
+ }
+
+ if (route->sourcemask) {
+ route->table = get_source_table(route);
+ route->flags |= DEVROUTE_SRCTABLE;
+ }
+
+ vlist_add(&ip->route, &route->node, route);
return;
error:
static int
route_cmp(const void *k1, const void *k2, void *ptr)
{
- return memcmp(k1, k2, sizeof(struct device_route) -
- offsetof(struct device_route, flags));
+ const struct device_route *r1 = k1, *r2 = k2;
+
+ if (r1->mask != r2->mask)
+ return r2->mask - r1->mask;
+
+ if (r1->metric != r2->metric)
+ return r1->metric - r2->metric;
+
+ if (r1->flags != r2->flags)
+ return r2->flags - r1->flags;
+
+ if (r1->sourcemask != r2->sourcemask)
+ return r1->sourcemask - r2->sourcemask;
+
+ int maskcmp = memcmp(&r1->source, &r2->source, sizeof(r1->source));
+ if (maskcmp)
+ return maskcmp;
+
+ return memcmp(&r1->addr, &r2->addr, sizeof(r1->addr));
}
static int
prefix_cmp(const void *k1, const void *k2, void *ptr)
{
- return memcmp(k1, k2, sizeof(struct device_prefix) -
+ return memcmp(k1, k2, offsetof(struct device_prefix, pclass) -
offsetof(struct device_prefix, addr));
}
struct interface *iface;
struct device *dev;
struct device_addr *a_new = NULL, *a_old = NULL;
+ bool replace = false;
bool keep = false;
+ bool v6 = false;
ip = container_of(tree, struct interface_ip_settings, addr);
iface = ip->iface;
if (a_new && a_old) {
keep = true;
- if (a_old->flags != a_new->flags ||
- a_old->valid_until != a_new->valid_until ||
- a_old->preferred_until != a_new->preferred_until)
+ if (a_old->flags != a_new->flags)
keep = false;
+ if (a_old->valid_until != a_new->valid_until ||
+ a_old->preferred_until != a_new->preferred_until)
+ replace = true;
+
if ((a_new->flags & DEVADDR_FAMILY) == DEVADDR_INET4 &&
a_new->broadcast != a_old->broadcast)
keep = false;
if (node_old) {
if (!(a_old->flags & DEVADDR_EXTERNAL) && a_old->enabled && !keep) {
interface_handle_subnet_route(iface, a_old, false);
+
+ if ((a_old->flags & DEVADDR_FAMILY) == DEVADDR_INET6)
+ v6 = true;
+
+ //This is needed for source routing to work correctly. If a device
+ //has two connections to a network using the same subnet, adding
+ //only the network-rule will cause packets to be routed through the
+ //first matching network (source IP matches both masks).
+ set_ip_source_policy(false, v6, IPRULE_PRIORITY_ADDR, &a_old->addr,
+ (v6) ? 128 : 32, (v6) ? iface->ip6table : iface->ip4table,
+ NULL, NULL);
+ set_ip_source_policy(false, v6, IPRULE_PRIORITY_NW, &a_old->addr,
+ a_old->mask, (v6) ? iface->ip6table : iface->ip4table, NULL, NULL);
+
system_del_address(dev, a_old);
}
free(a_old);
if (node_new) {
a_new->enabled = true;
- if (!(a_new->flags & DEVADDR_EXTERNAL) && !keep) {
+ if (!(a_new->flags & DEVADDR_EXTERNAL) && (!keep || replace)) {
system_add_address(dev, a_new);
+
+ if (!keep) {
+ if ((a_new->flags & DEVADDR_FAMILY) == DEVADDR_INET6)
+ v6 = true;
+
+ set_ip_source_policy(true, v6, IPRULE_PRIORITY_ADDR, &a_new->addr,
+ (v6) ? 128 : 32, (v6) ? iface->ip6table : iface->ip4table,
+ NULL, NULL);
+ set_ip_source_policy(true, v6, IPRULE_PRIORITY_NW, &a_new->addr,
+ a_new->mask, (v6) ? iface->ip6table : iface->ip4table,
+ NULL, NULL);
+ }
+
if ((a_new->flags & DEVADDR_OFFLINK) || iface->metric)
interface_handle_subnet_route(iface, a_new, true);
}
if (node_old) {
if (!(route_old->flags & DEVADDR_EXTERNAL) && route_old->enabled && !keep)
system_del_route(dev, route_old);
+
+ put_source_table(route_old);
free(route_old);
}
static void
-interface_set_prefix_address(struct interface *iface, bool add,
- struct device_prefix_assignment *assignment)
+interface_set_prefix_address(struct device_prefix_assignment *assignment,
+ const struct device_prefix *prefix, struct interface *iface, bool add)
{
- struct interface *uplink = assignment->prefix->iface;
+ const struct interface *uplink = prefix->iface;
if (!iface->l3_dev.dev)
return;
struct device_addr addr;
memset(&addr, 0, sizeof(addr));
- addr.addr.in6 = assignment->addr;
+ addr.addr.in6 = prefix->addr;
+ addr.addr.in6.s6_addr32[1] |= htonl(assignment->assigned);
+ addr.addr.in6.s6_addr[15] += 1;
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);
+ addr.preferred_until = prefix->preferred_until;
+ addr.valid_until = prefix->valid_until;
+
+ if (!add && 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);
+ if (prefix->iface) {
+ set_ip_source_policy(false, true, IPRULE_PRIORITY_NW, &addr.addr,
+ addr.mask, prefix->iface->ip6table, iface, NULL);
+
+ set_ip_source_policy(false, true, IPRULE_PRIORITY_REJECT, &addr.addr,
+ addr.mask, 0, iface, "unreachable");
}
- } else {
+
+ assignment->enabled = false;
+ } else if (add && (iface->state == IFS_UP || iface->state == IFS_SETUP)) {
system_add_address(l3_downlink, &addr);
+ if (prefix->iface && !assignment->enabled) {
+ set_ip_source_policy(true, true, IPRULE_PRIORITY_REJECT, &addr.addr,
+ addr.mask, 0, iface, "unreachable");
+ set_ip_source_policy(true, true, IPRULE_PRIORITY_NW, &addr.addr,
+ addr.mask, prefix->iface->ip6table, iface, NULL);
+ }
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 = true;
}
- assignment->enabled = add;
}
-
-static void
-interface_update_prefix_assignments(struct vlist_tree *tree,
- struct vlist_node *node_new,
- struct vlist_node *node_old)
+static bool interface_prefix_assign(struct list_head *list,
+ struct device_prefix_assignment *assign)
{
- 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);
+ int32_t current = 0, asize = (1 << (64 - assign->length)) - 1;
+ struct device_prefix_assignment *c;
+ list_for_each_entry(c, list, head) {
+ if (assign->assigned != -1) {
+ if (assign->assigned >= current && assign->assigned + asize < c->assigned) {
+ list_add_tail(&assign->head, &c->head);
+ return true;
+ }
+ } else if (assign->assigned == -1) {
+ current = (current + asize) & (~asize);
+ if (current + asize < c->assigned) {
+ assign->assigned = current;
+ list_add_tail(&assign->head, &c->head);
+ return true;
+ }
+ }
+ current = (c->assigned + (1 << (64 - c->length)));
+ }
+ return false;
+}
- // 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);
+static void interface_update_prefix_assignments(struct device_prefix *prefix, bool setup)
+{
+ struct device_prefix_assignment *c;
+ struct interface *iface;
- 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;
+ // Delete all assignments
+ while (!list_empty(&prefix->assignments)) {
+ c = list_first_entry(&prefix->assignments,
+ struct device_prefix_assignment, head);
+ if ((iface = vlist_find(&interfaces, c->name, iface, node)))
+ interface_set_prefix_address(c, prefix, iface, false);
+ list_del(&c->head);
+ free(c);
+ }
- // Invert assignment
- uint64_t assigned = ~prefix->avail;
- assigned &= (1ULL << (64 - prefix->length)) - 1;
- assigned &= ~(want - 1);
+ if (!setup)
+ return;
- // 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;
+ // End-of-assignment sentinel
+ c = malloc(sizeof(*c) + 1);
+ c->assigned = 1 << (64 - prefix->length);
+ c->length = 64;
+ c->name[0] = 0;
+ list_add(&c->head, &prefix->assignments);
+
+ // Excluded prefix
+ if (prefix->excl_length > 0) {
+ const char name[] = "!excluded";
+ c = malloc(sizeof(*c) + sizeof(name));
+ c->assigned = ntohl(prefix->excl_addr.s6_addr32[1]) &
+ ((1 << (64 - prefix->length)) - 1);
+ c->length = prefix->excl_length;
+ memcpy(c->name, name, sizeof(name));
+ list_add(&c->head, &prefix->assignments);
}
- if (node_new && (iface->state == IFS_UP || iface->state == IFS_SETUP))
- interface_set_prefix_address(iface, true, new);
-}
+ bool assigned_any = false;
+ struct list_head assign_later = LIST_HEAD_INIT(assign_later);
+ vlist_for_each_element(&interfaces, iface, node) {
+ if (iface->assignment_length < 48 ||
+ iface->assignment_length > 64)
+ continue;
+ // Test whether there is a matching class
+ if (!list_empty(&iface->assignment_classes)) {
+ bool found = false;
-void
-interface_ip_set_prefix_assignment(struct device_prefix *prefix,
- struct interface *iface, uint8_t length)
-{
- struct device_prefix_assignment *assignment;
+ struct interface_assignment_class *c;
+ list_for_each_entry(c, &iface->assignment_classes, head) {
+ if (!strcmp(c->name, prefix->pclass)) {
+ found = true;
+ break;
+ }
+ }
- 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 (!found)
+ continue;
+ }
- if (prefix->avail < want && prefix->avail > 0) {
- do {
- want = 1ULL << (64 - ++length);
- } while (want > prefix->avail);
+ size_t namelen = strlen(iface->name) + 1;
+ c = malloc(sizeof(*c) + namelen);
+ c->length = iface->assignment_length;
+ c->assigned = iface->assignment_hint;
+ c->enabled = false;
+ memcpy(c->name, iface->name, namelen);
+
+ // First process all custom assignments, put all others in later-list
+ if (c->assigned == -1 || !interface_prefix_assign(&prefix->assignments, c)) {
+ if (c->assigned != -1) {
+ c->assigned = -1;
+ netifd_log_message(L_WARNING, "Failed to assign requested subprefix "
+ "of size %hhu for %s, trying other\n", c->length, c->name);
+ }
+
+ struct list_head *next = &assign_later;
+ struct device_prefix_assignment *n;
+ list_for_each_entry(n, &assign_later, head) {
+ if (n->length < c->length) {
+ next = &n->head;
+ break;
+ }
+ }
+ list_add_tail(&c->head, next);
}
- if (prefix->avail < want)
- return;
+ if (c->assigned != -1)
+ assigned_any = true;
+ }
- assignment = calloc_a(sizeof(*assignment),
- &name, strlen(iface->name) + 1);
- assignment->prefix = prefix;
- assignment->length = length;
- assignment->name = strcpy(name, iface->name);
+ // Then try to assign all other + failed custom assignments
+ while (!list_empty(&assign_later)) {
+ c = list_first_entry(&assign_later, struct device_prefix_assignment, head);
+ list_del(&c->head);
+
+ bool assigned = false;
+ do {
+ assigned = interface_prefix_assign(&prefix->assignments, c);
+ } while (!assigned && ++c->length <= 64);
+
+ if (!assigned) {
+ netifd_log_message(L_WARNING, "Failed to assign subprefix "
+ "of size %hhu for %s\n", c->length, c->name);
+ free(c);
+ } else {
+ assigned_any = true;
+ }
+ }
- vlist_add(prefix->assignments, &assignment->node, assignment->name);
+ list_for_each_entry(c, &prefix->assignments, head)
+ if ((iface = vlist_find(&interfaces, c->name, iface, node)))
+ interface_set_prefix_address(c, prefix, iface, true);
+
+ if (!assigned_any)
+ netifd_log_message(L_WARNING, "You have delegated IPv6-prefixes but haven't assigned them "
+ "to any interface. Did you forget to set option ip6assign on your lan-interfaces?");
+}
+
+
+void interface_refresh_assignments(bool hint)
+{
+ static bool refresh = false;
+ if (!hint && refresh) {
+ struct device_prefix *p;
+ list_for_each_entry(p, &prefixes, head)
+ interface_update_prefix_assignments(p, true);
}
+ refresh = hint;
}
+
static void
interface_update_prefix(struct vlist_tree *tree,
struct vlist_node *node_new,
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);
+ struct device_prefix_assignment *c;
+ struct interface *iface;
+
+ if (node_old && node_new) {
+ // Move assignments and refresh addresses to update valid times
+ list_splice(&prefix_old->assignments, &prefix_new->assignments);
+ list_for_each_entry(c, &prefix_new->assignments, head)
+ if ((iface = vlist_find(&interfaces, c->name, iface, node)))
+ interface_set_prefix_address(c, prefix_new, iface, true);
+ } else if (node_new) {
// Set null-route to avoid routing loops
system_add_route(NULL, &route);
- }
- if (node_old) {
+ if (!prefix_new->iface || !prefix_new->iface->proto_ip.no_delegation)
+ interface_update_prefix_assignments(prefix_new, true);
+ } else if (node_old) {
// Remove null-route
+ interface_update_prefix_assignments(prefix_old, false);
system_del_route(NULL, &route);
+ }
- list_del(&prefix_old->head);
-
- if (prefix_old->assignments) {
- vlist_flush_all(prefix_old->assignments);
- free(prefix_old->assignments);
- }
+ if (node_old) {
+ if (prefix_old->head.next)
+ list_del(&prefix_old->head);
free(prefix_old);
}
- if (node_new)
+ if (node_new && (!prefix_new->iface || !prefix_new->iface->proto_ip.no_delegation))
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)
+ uint8_t length, time_t valid_until, time_t preferred_until,
+ struct in6_addr *excl_addr, uint8_t excl_length, const char *pclass)
{
- struct device_prefix *prefix = calloc(1, sizeof(*prefix));
+ if (!pclass)
+ pclass = (iface) ? iface->name : "local";
+
+ struct device_prefix *prefix = calloc(1, sizeof(*prefix) + strlen(pclass) + 1);
prefix->length = length;
prefix->addr = *addr;
prefix->preferred_until = preferred_until;
prefix->valid_until = valid_until;
prefix->iface = iface;
+ INIT_LIST_HEAD(&prefix->assignments);
+
+ if (excl_addr) {
+ prefix->excl_addr = *excl_addr;
+ prefix->excl_length = excl_length;
+ }
+
+ strcpy(prefix->pclass, pclass);
if (iface)
vlist_add(&iface->proto_ip.prefix, &prefix->node, &prefix->addr);
if (ula_prefix)
interface_update_prefix(NULL, NULL, &ula_prefix->node);
- ula_prefix = interface_ip_add_device_prefix(NULL, &addr, length, 0, 0);
+ ula_prefix = interface_ip_add_device_prefix(NULL, &addr, length,
+ 0, 0, NULL, 0, NULL);
}
}
struct dns_server *s;
struct dns_search_domain *d;
const char *str;
- char buf[32];
+ char buf[INET6_ADDRSTRLEN];
vlist_simple_for_each_element(&ip->dns_servers, s, node) {
str = inet_ntop(s->af, &s->addr, buf, sizeof(buf));
system_del_route(dev, route);
route->enabled = _enabled;
}
+
+ struct device_prefix *c;
+ struct device_prefix_assignment *a;
+ list_for_each_entry(c, &prefixes, head)
+ list_for_each_entry(a, &c->assignments, head)
+ if (!strcmp(a->name, ip->iface->name))
+ interface_set_prefix_address(a, c, ip->iface, enabled);
+
+ if (ip->iface && ip->iface->l3_dev.dev) {
+ set_ip_lo_policy(enabled, true, ip->iface);
+ set_ip_lo_policy(enabled, false, ip->iface);
+
+ set_ip_source_policy(enabled, true, IPRULE_PRIORITY_REJECT + ip->iface->l3_dev.dev->ifindex,
+ NULL, 0, 0, ip->iface, "failed_policy");
+ }
}
void
projects / project / netifd.git / blobdiff