X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface-ip.c;h=084688c61c8e1921401784d44f3a948d5893b124;hp=3b6be6b6aa803412bd48ac68d18c1e032279cf54;hb=fce61c6d35515b6f89b50f42ac2cba6b4b60159e;hpb=3c2c1bd38a577130848167093bf45eee0535f32a diff --git a/interface-ip.c b/interface-ip.c index 3b6be6b..084688c 100644 --- a/interface-ip.c +++ b/interface-ip.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #include @@ -37,6 +36,7 @@ enum { ROUTE_MTU, ROUTE_VALID, ROUTE_TABLE, + ROUTE_SOURCE, __ROUTE_MAX }; @@ -49,6 +49,7 @@ static const struct blobmsg_policy route_attr[__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 uci_blob_param_list route_attr_list = { @@ -58,6 +59,7 @@ const struct uci_blob_param_list route_attr_list = { 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; @@ -92,7 +94,7 @@ match_if_addr(union if_addr *a1, union if_addr *a2, int mask) } 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 = { @@ -106,9 +108,9 @@ static int set_ip_source_policy(bool add, bool v6, unsigned int priority, rule.src_mask = mask; } - if (iface) { + if (table) { rule.flags |= IPRULE_LOOKUP; - rule.lookup = (v6) ? iface->ip6table : iface->ip4table; + rule.lookup = table; if (!rule.lookup) return 0; @@ -195,6 +197,72 @@ __find_ip_route_target(struct interface_ip_settings *ip, union if_addr *a, } } +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) { @@ -329,7 +397,20 @@ interface_ip_add_route(struct interface *iface, struct blob_attr *attr, 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; } @@ -351,6 +432,11 @@ interface_ip_add_route(struct interface *iface, struct blob_attr *attr, bool v6) 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; @@ -379,6 +465,13 @@ route_cmp(const void *k1, const void *k2, void *ptr) 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)); } @@ -426,6 +519,7 @@ interface_update_proto_addr(struct vlist_tree *tree, struct interface *iface; struct device *dev; struct device_addr *a_new = NULL, *a_old = NULL; + bool replace = false; bool keep = false; bool v6 = false; @@ -453,11 +547,13 @@ interface_update_proto_addr(struct vlist_tree *tree, 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; @@ -475,9 +571,10 @@ interface_update_proto_addr(struct vlist_tree *tree, //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, NULL, NULL); + (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, NULL, NULL); + a_old->mask, (v6) ? iface->ip6table : iface->ip4table, NULL, NULL); system_del_address(dev, a_old); } @@ -486,16 +583,20 @@ interface_update_proto_addr(struct vlist_tree *tree, 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, NULL, NULL); - set_ip_source_policy(true, v6, IPRULE_PRIORITY_NW, &a_new->addr, - a_new->mask, iface, NULL, NULL); + 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); @@ -536,6 +637,8 @@ interface_update_proto_route(struct vlist_tree *tree, 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); } @@ -606,10 +709,10 @@ interface_set_prefix_address(struct device_prefix_assignment *assignment, system_add_address(l3_downlink, &addr); if (prefix->iface) { set_ip_source_policy(false, true, IPRULE_PRIORITY_NW, &addr.addr, - addr.mask, prefix->iface, iface, NULL); + addr.mask, prefix->iface->ip6table, iface, NULL); set_ip_source_policy(false, true, IPRULE_PRIORITY_REJECT, &addr.addr, - addr.mask, NULL, iface, "unreachable"); + addr.mask, 0, iface, "unreachable"); } assignment->enabled = false; @@ -617,10 +720,10 @@ interface_set_prefix_address(struct device_prefix_assignment *assignment, system_add_address(l3_downlink, &addr); if (prefix->iface && !assignment->enabled) { set_ip_source_policy(true, true, IPRULE_PRIORITY_REJECT, &addr.addr, - addr.mask, NULL, iface, "unreachable"); + addr.mask, 0, iface, "unreachable"); set_ip_source_policy(true, true, IPRULE_PRIORITY_NW, &addr.addr, - addr.mask, prefix->iface, iface, NULL); + addr.mask, prefix->iface->ip6table, iface, NULL); } if (uplink && uplink->l3_dev.dev) { int mtu = system_update_ipv6_mtu( @@ -639,7 +742,7 @@ static bool interface_prefix_assign(struct list_head *list, 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; } @@ -733,7 +836,7 @@ static void interface_update_prefix_assignments(struct device_prefix *prefix, bo struct list_head *next = &assign_later; struct device_prefix_assignment *n; list_for_each_entry(n, &assign_later, head) { - if (n->length > c->length) { + if (n->length < c->length) { next = &n->head; break; } @@ -816,7 +919,9 @@ interface_update_prefix(struct vlist_tree *tree, } else if (node_new) { // Set null-route to avoid routing loops system_add_route(NULL, &route); - 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) { // Remove null-route interface_update_prefix_assignments(prefix_old, false); @@ -824,11 +929,12 @@ interface_update_prefix(struct vlist_tree *tree, } 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); } @@ -1096,7 +1202,7 @@ void interface_ip_set_enabled(struct interface_ip_settings *ip, bool enabled) 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, NULL, ip->iface, "failed_policy"); + NULL, 0, 0, ip->iface, "failed_policy"); } }