X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface-ip.c;h=2444cda2128e4505b67186bd1ea85d9839fad17c;hp=7155fe4a404ba09f2ba87bb33b2dc2cdc120db29;hb=0b66ee22a3a339188ab2b8661c6af62883be93c2;hpb=ec72439d9960e6f37293c715c3f7b9584b03ddd8 diff --git a/interface-ip.c b/interface-ip.c index 7155fe4..2444cda 100644 --- a/interface-ip.c +++ b/interface-ip.c @@ -90,6 +90,44 @@ match_if_addr(union if_addr *a1, union if_addr *a2, int mask) 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, struct interface *iface) +{ + + + struct iprule rule = { + .flags = IPRULE_SRC | IPRULE_LOOKUP | IPRULE_PRIORITY, + .priority = priority, + .lookup = (v6) ? iface->ip6table : iface->ip4table, + .src_addr = *addr, + .src_mask = mask, + }; + + if (!rule.lookup) + return 0; + + 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) { @@ -102,7 +140,13 @@ __find_ip_addr_target(struct interface_ip_settings *ip, union if_addr *a, bool v 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; @@ -151,9 +195,8 @@ interface_ip_find_route_target(struct interface *iface, union if_addr *a, } 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); @@ -169,7 +212,7 @@ interface_ip_add_target_route(union if_addr *addr, bool v6) 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; @@ -177,6 +220,16 @@ interface_ip_add_target_route(union if_addr *addr, bool v6) /* 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) { @@ -188,6 +241,7 @@ interface_ip_add_target_route(union if_addr *addr, bool v6) 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; @@ -205,6 +259,7 @@ interface_ip_add_route(struct interface *iface, struct blob_attr *attr, bool v6) 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)); @@ -257,6 +312,12 @@ interface_ip_add_route(struct interface *iface, struct blob_attr *attr, bool v6) route->flags |= DEVROUTE_MTU; } + // Use source-based routing + 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)); @@ -289,10 +350,10 @@ route_cmp(const void *k1, const void *k2, void *ptr) { const struct device_route *r1 = k1, *r2 = k2; - if (r1->mask != r2->mask); + if (r1->mask != r2->mask) return r2->mask - r1->mask; - if (r1->metric != r2->metric); + if (r1->metric != r2->metric) return r1->metric - r2->metric; if (r1->flags != r2->flags) @@ -346,6 +407,7 @@ interface_update_proto_addr(struct vlist_tree *tree, struct device *dev; struct device_addr *a_new = NULL, *a_old = NULL; bool keep = false; + bool v6 = false; ip = container_of(tree, struct interface_ip_settings, addr); iface = ip->iface; @@ -384,6 +446,19 @@ interface_update_proto_addr(struct vlist_tree *tree, 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, iface); + set_ip_source_policy(false, v6, IPRULE_PRIORITY_NW, &a_old->addr, + a_old->mask, iface); + system_del_address(dev, a_old); } free(a_old); @@ -393,6 +468,15 @@ interface_update_proto_addr(struct vlist_tree *tree, 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) + 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); + if ((a_new->flags & DEVADDR_OFFLINK) || iface->metric) interface_handle_subnet_route(iface, a_new, true); } @@ -476,6 +560,41 @@ interface_update_host_route(struct vlist_tree *tree, 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; @@ -501,6 +620,8 @@ interface_set_prefix_address(struct device_prefix_assignment *assignment, 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) { @@ -510,6 +631,8 @@ interface_set_prefix_address(struct device_prefix_assignment *assignment, system_update_ipv6_mtu(l3_downlink, mtu); } assignment->enabled = true; + + interface_trigger_ula_prefix(iface, prefix, false); } } @@ -601,7 +724,13 @@ static void interface_update_prefix_assignments(struct device_prefix *prefix, bo 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); @@ -642,6 +771,7 @@ interface_update_prefix(struct vlist_tree *tree, 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; @@ -653,14 +783,21 @@ interface_update_prefix(struct vlist_tree *tree, 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_ip_source_policy(true, true, IPRULE_PRIORITY_NW, &route.addr, + route.mask, prefix_new->iface); + 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); system_del_route(NULL, &route); } @@ -926,6 +1063,9 @@ void interface_ip_set_enabled(struct interface_ip_settings *ip, bool enabled) 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_ip_lo_policy(enabled, true, ip->iface); + set_ip_lo_policy(enabled, false, ip->iface); } void