#include <string.h>
#include <stdlib.h>
#include <stdio.h>
-#include <unistd.h>
#include <limits.h>
#include <arpa/inet.h>
ROUTE_MTU,
ROUTE_VALID,
ROUTE_TABLE,
+ ROUTE_SOURCE,
__ROUTE_MAX
};
[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;
}
static int set_ip_source_policy(bool add, bool v6, unsigned int priority,
- const union if_addr *addr, uint8_t mask, struct interface *iface)
+ const union if_addr *addr, uint8_t mask, unsigned int table,
+ struct interface *in_iface, const char *action)
{
-
-
struct iprule rule = {
- .flags = IPRULE_SRC | IPRULE_LOOKUP | IPRULE_PRIORITY,
- .priority = priority,
- .lookup = (v6) ? iface->ip6table : iface->ip4table,
- .src_addr = *addr,
- .src_mask = mask,
+ .flags = IPRULE_PRIORITY,
+ .priority = priority
};
- if (!rule.lookup)
- return 0;
+ 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;
}
}
+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)
{
}
// Use source-based routing
- if (is_proto_route) {
+ if ((cur = tb[ROUTE_SOURCE]) != NULL) {
+ char *saveptr, *source = alloca(blobmsg_data_len(cur));
+ memcpy(source, blobmsg_data(cur), blobmsg_data_len(cur));
+
+ 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;
}
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;
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;
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;
//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, iface);
+ (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, iface);
+ a_old->mask, (v6) ? iface->ip6table : iface->ip4table, NULL, NULL);
system_del_address(dev, 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 ((a_new->flags & DEVADDR_FAMILY) == DEVADDR_INET6)
- v6 = true;
+ 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, iface);
- set_ip_source_policy(true, v6, IPRULE_PRIORITY_NW, &a_new->addr,
- a_new->mask, iface);
+ 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 device_prefix_assignment *assignment,
- const struct device_prefix *prefix, struct interface *iface, bool add);
-
-static void interface_trigger_ula_prefix(struct interface *iface,
- const struct device_prefix *prefix, bool enable)
-{
- if (prefix == ula_prefix || (prefix->addr.s6_addr[0] & 0xfe) != 0xfc)
- return;
-
- bool external_ula = false;
- struct device_prefix_assignment *ula_assign = NULL;
- struct device_prefix *c;
- list_for_each_entry(c, &prefixes, head) {
- if (c != ula_prefix && (c->addr.s6_addr[0] & 0xfe) != 0xfc)
- continue;
-
- struct device_prefix_assignment *a;
- list_for_each_entry(a, &c->assignments, head) {
- if (!strcmp(a->name, iface->name)) {
- if (c == ula_prefix)
- ula_assign = a;
- else if (a->enabled)
- external_ula = true;
- }
- }
-
- }
-
- // Remove ULA assignment if there is an externally managed ULA and vice versa
- if (ula_assign && ((enable && !external_ula) || (!enable && external_ula)))
- interface_set_prefix_address(ula_assign, ula_prefix, iface, enable);
-}
-
-
-static void
-interface_set_prefix_address(struct device_prefix_assignment *assignment,
const struct device_prefix *prefix, struct interface *iface, bool add)
{
const struct interface *uplink = prefix->iface;
if (!addr.valid_until || addr.valid_until - now > 7200)
addr.valid_until = now + 7200;
system_add_address(l3_downlink, &addr);
- assignment->enabled = false;
+ if (prefix->iface) {
+ set_ip_source_policy(false, true, IPRULE_PRIORITY_NW, &addr.addr,
+ addr.mask, prefix->iface->ip6table, iface, NULL);
- interface_trigger_ula_prefix(iface, prefix, true);
+ set_ip_source_policy(false, true, IPRULE_PRIORITY_REJECT, &addr.addr,
+ addr.mask, 0, iface, "unreachable");
+ }
+
+ 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);
system_update_ipv6_mtu(l3_downlink, mtu);
}
assignment->enabled = true;
-
- interface_trigger_ula_prefix(iface, prefix, false);
}
}
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) {
+ if (assign->assigned >= current && assign->assigned + asize < c->assigned) {
list_add_tail(&assign->head, &c->head);
return true;
}
list_add(&c->head, &prefix->assignments);
}
+ bool assigned_any = false;
struct list_head assign_later = LIST_HEAD_INIT(assign_later);
vlist_for_each_element(&interfaces, iface, node) {
- if (iface->config_ip.assignment_length < 48 ||
- iface->config_ip.assignment_length > 64)
+ 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;
+
+ struct interface_assignment_class *c;
+ list_for_each_entry(c, &iface->assignment_classes, head) {
+ if (!strcmp(c->name, prefix->pclass)) {
+ found = true;
+ break;
+ }
+ }
+
+ if (!found)
+ continue;
+ }
+
size_t namelen = strlen(iface->name) + 1;
c = malloc(sizeof(*c) + namelen);
- c->length = iface->config_ip.assignment_length;
- c->assigned = iface->config_ip.assignment_hint;
+ c->length = iface->assignment_length;
+ c->assigned = iface->assignment_hint;
c->enabled = false;
memcpy(c->name, iface->name, namelen);
netifd_log_message(L_WARNING, "Failed to assign requested subprefix "
"of size %hhu for %s, trying other\n", c->length, c->name);
}
- list_add_tail(&c->head, &assign_later);
+
+ 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 (c->assigned != -1)
+ assigned_any = true;
}
// Then try to assign all other + failed custom assignments
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;
}
}
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?");
}
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 and set routing policy
+ // Set null-route to avoid routing loops
system_add_route(NULL, &route);
- if (prefix_new->iface)
- set_ip_source_policy(true, true, IPRULE_PRIORITY_NW, &route.addr,
- route.mask, prefix_new->iface);
-
- interface_update_prefix_assignments(prefix_new, true);
+ if (!prefix_new->iface || !prefix_new->iface->proto_ip.no_delegation)
+ interface_update_prefix_assignments(prefix_new, true);
} else if (node_old) {
- interface_update_prefix_assignments(prefix_old, false);
-
// Remove null-route
- if (prefix_old->iface)
- set_ip_source_policy(false, true, IPRULE_PRIORITY_NW, &route.addr,
- route.mask, prefix_old->iface);
+ interface_update_prefix_assignments(prefix_old, false);
system_del_route(NULL, &route);
}
if (node_old) {
- list_del(&prefix_old->head);
+ 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,
- struct in6_addr *excl_addr, uint8_t excl_length)
+ 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->excl_length = excl_length;
}
+ strcpy(prefix->pclass, pclass);
+
if (iface)
vlist_add(&iface->proto_ip.prefix, &prefix->node, &prefix->addr);
else
interface_update_prefix(NULL, NULL, &ula_prefix->node);
ula_prefix = interface_ip_add_device_prefix(NULL, &addr, length,
- 0, 0, NULL, 0);
+ 0, 0, NULL, 0, NULL);
}
}
if (!strcmp(a->name, ip->iface->name))
interface_set_prefix_address(a, c, ip->iface, enabled);
- set_ip_lo_policy(enabled, true, ip->iface);
- set_ip_lo_policy(enabled, false, ip->iface);
+ 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