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 int set_ipv6_lo_policy(bool add, int ifindex)
+{
+ struct iprule rule = {
+ .flags = IPRULE_INET6 | IPRULE_IN | IPRULE_LOOKUP | IPRULE_PRIORITY,
+ .priority = 65535,
+ .lookup = interface_ip_resolve_v6_rtable(ifindex),
+ .in_dev = "lo"
+ };
+
+ 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;
}
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;
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 (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);
}
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 ((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);
+
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);
}
}
}
+int interface_ip_resolve_v6_rtable(int ifindex)
+{
+ return ifindex + 1000;
+}
+
void
interface_add_dns_server(struct interface_ip_settings *ip, const char *str)
{
list_for_each_entry(a, &c->assignments, head)
if (!strcmp(a->name, ip->iface->name))
interface_set_prefix_address(a, c, ip->iface, enabled);
+
+ set_ipv6_lo_policy(enabled, dev->ifindex);
}
void
projects / project / netifd.git / blobdiff