#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,
};
}
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;
}
// 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));
+
+ const char *addr = strtok_r(source, "/", &saveptr);
+ const char *mask = strtok_r(NULL, "/", &saveptr);
+
+ if (!addr || inet_pton(af, addr, &route->source) < 1) {
+ DPRINTF("Failed to parse route source: %s\n", addr);
+ goto error;
+ }
+
+ route->sourcemask = (mask) ? atoi(mask) : ((af == AF_INET6) ? 128 : 32);
+ }
+
if (is_proto_route) {
route->table = (v6) ? iface->ip6table : iface->ip4table;
route->flags |= DEVROUTE_SRCTABLE;
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;
iface = ip->iface;
dev = iface->l3_dev.dev;
+ if (!node_new || !node_old)
+ iface->updated |= IUF_ADDRESS;
+
if (node_new) {
a_new = container_of(node_new, struct device_addr, node);
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 ((a_old->flags & DEVADDR_FAMILY) == DEVADDR_INET6)
v6 = true;
+ unsigned int table = (v6) ? iface->ip6table : iface->ip4table;
+
//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, iface);
- set_ip_source_policy(false, v6, IPRULE_PRIORITY_NW, &a_old->addr,
- a_old->mask, iface);
+ if (table) {
+ set_ip_source_policy(false, v6, IPRULE_PRIORITY_ADDR, &a_old->addr,
+ (v6) ? 128 : 32, table, NULL, NULL);
+ set_ip_source_policy(false, v6, IPRULE_PRIORITY_NW, &a_old->addr,
+ a_old->mask, table, NULL, NULL);
+ }
system_del_address(dev, a_old);
}
+ free(a_old->pclass);
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 ((a_new->flags & DEVADDR_FAMILY) == DEVADDR_INET6)
- v6 = true;
+ if (!keep) {
+ if ((a_new->flags & DEVADDR_FAMILY) == DEVADDR_INET6)
+ v6 = true;
+
+ unsigned int table = (v6) ? iface->ip6table : iface->ip4table;
- 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);
+ if (table) {
+ set_ip_source_policy(true, v6, IPRULE_PRIORITY_ADDR, &a_new->addr,
+ (v6) ? 128 : 32, table, NULL, NULL);
+ set_ip_source_policy(true, v6, IPRULE_PRIORITY_NW, &a_new->addr,
+ a_new->mask, table, NULL, NULL);
+ }
+ }
if ((a_new->flags & DEVADDR_OFFLINK) || iface->metric)
interface_handle_subnet_route(iface, a_new, true);
iface = ip->iface;
dev = iface->l3_dev.dev;
+ if (!node_new || !node_old)
+ iface->updated |= IUF_ROUTE;
+
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));
+ keep = !memcmp(&route_old->nexthop, &route_new->nexthop, sizeof(route_old->nexthop)) &&
+ (route_old->table == route_new->table);
if (node_old) {
if (!(route_old->flags & DEVADDR_EXTERNAL) && route_old->enabled && !keep)
system_del_route(dev, route_old);
+
free(route_old);
}
if (!addr.valid_until || addr.valid_until - now > 7200)
addr.valid_until = now + 7200;
system_add_address(l3_downlink, &addr);
+ if (prefix->iface) {
+ if (prefix->iface->ip6table)
+ 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");
+ }
+
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");
+
+ if (prefix->iface->ip6table)
+ 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);
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;
}
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)
prefix_old = container_of(node_old, struct device_prefix, node);
prefix_new = container_of(node_new, struct device_prefix, node);
+ struct interface_ip_settings *ip = container_of(tree, struct interface_ip_settings, prefix);
+ if (tree && (!node_new || !node_old))
+ ip->iface->updated |= IUF_PREFIX;
+
struct device_route route;
memset(&route, 0, sizeof(route));
route.flags = DEVADDR_INET6;
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);
}
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