return !memcmp(p1, p2, sizeof(*p1));
}
+static int set_ipv6_source_policy(bool add, const union if_addr *addr, uint8_t mask, int ifindex)
+{
+ struct iprule rule = {
+ .flags = IPRULE_INET6 | IPRULE_SRC | IPRULE_LOOKUP | IPRULE_PRIORITY,
+ .priority = 65535,
+ .lookup = interface_ip_resolve_v6_rtable(ifindex),
+ .src_addr = *addr,
+ .src_mask = mask,
+ };
+
+ 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;
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_v6_proto_route = v6 && iface;
blobmsg_parse(route_attr, __ROUTE_MAX, tb, blobmsg_data(attr), blobmsg_data_len(attr));
route->flags |= DEVROUTE_MTU;
}
+ // Use source-based routing
+ if (is_v6_proto_route) {
+ route->table = interface_ip_resolve_v6_rtable(iface->l3_dev.dev->ifindex);
+ 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));
if ((cur = tb[ROUTE_VALID]) != NULL)
route->valid_until = system_get_rtime() + blobmsg_get_u32(cur);
- vlist_add(&ip->route, &route->node, &route->flags);
+ 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;
+
+ return memcmp(&r1->addr, &r2->addr, sizeof(r1->addr));
}
static int
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)
+ set_ipv6_source_policy(false, &a_old->addr, a_old->mask, dev->ifindex);
+
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 ((a_new->flags & DEVADDR_FAMILY) == DEVADDR_INET6)
+ set_ipv6_source_policy(true, &a_new->addr, a_new->mask, dev->ifindex);
+
if ((a_new->flags & DEVADDR_OFFLINK) || iface->metric)
interface_handle_subnet_route(iface, a_new, true);
}
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;
addr.valid_until = now + 7200;
system_add_address(l3_downlink, &addr);
assignment->enabled = false;
+
+ interface_trigger_ula_prefix(iface, prefix, true);
} else if (add && (iface->state == IFS_UP || iface->state == IFS_SETUP)) {
system_add_address(l3_downlink, &addr);
if (uplink && uplink->l3_dev.dev) {
system_update_ipv6_mtu(l3_downlink, mtu);
}
assignment->enabled = true;
+
+ interface_trigger_ula_prefix(iface, prefix, false);
}
}
while (!list_empty(&assign_later)) {
c = list_first_entry(&assign_later, struct device_prefix_assignment, head);
list_del(&c->head);
- if (!interface_prefix_assign(&prefix->assignments, c)) {
+
+ 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);
route.mask = (node_new) ? prefix_new->length : prefix_old->length;
route.addr.in6 = (node_new) ? prefix_new->addr : prefix_old->addr;
+
struct device_prefix_assignment *c;
struct interface *iface;
if (node_old && node_new) {
// Move assignments and refresh addresses to update valid times
- list_splice_init(&prefix_old->assignments, &prefix_new->assignments);
+ 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
+ // Set null-route to avoid routing loops and set routing policy
system_add_route(NULL, &route);
+ if (prefix_new->iface)
+ set_ipv6_source_policy(true, &route.addr, route.mask,
+ prefix_new->iface->l3_dev.dev->ifindex);
+
- INIT_LIST_HEAD(&prefix_new->assignments);
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_ipv6_source_policy(false, &route.addr, route.mask,
+ prefix_old->iface->l3_dev.dev->ifindex);
system_del_route(NULL, &route);
}
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;
}
}
+int interface_ip_resolve_v6_rtable(int ifindex)
+{
+ return ifindex + 1000;
+}
+
void
interface_add_dns_server(struct interface_ip_settings *ip, const char *str)
{
projects / project / netifd.git / blobdiff