X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface-ip.c;h=165d4a8d52c8f4fa939efc5f3b54002029f08e5a;hp=31842c41e85a463f06c267ff101a3847b72f8e4e;hb=2bc475db30ab2716e1dd430f8eb982ba6e886b74;hpb=570302d28d18d47f095f864be161045e169b5941 diff --git a/interface-ip.c b/interface-ip.c index 31842c4..165d4a8 100644 --- a/interface-ip.c +++ b/interface-ip.c @@ -17,6 +17,7 @@ #include #include +#include #include #include "netifd.h" @@ -90,16 +91,41 @@ match_if_addr(union if_addr *a1, union if_addr *a2, int mask) return !memcmp(p1, p2, sizeof(*p1)); } -static int set_ipv6_source_policy(bool add, const union if_addr *addr, uint8_t mask, int ifindex) +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_INET6 | IPRULE_SRC | IPRULE_LOOKUP | IPRULE_PRIORITY, - .priority = 65535, - .lookup = interface_ip_resolve_v6_rtable(ifindex), + .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); } @@ -234,7 +260,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_v6_proto_route = v6 && iface; + bool is_proto_route = !!iface; blobmsg_parse(route_attr, __ROUTE_MAX, tb, blobmsg_data(attr), blobmsg_data_len(attr)); @@ -288,8 +314,8 @@ interface_ip_add_route(struct interface *iface, struct blob_attr *attr, bool v6) } // Use source-based routing - if (is_v6_proto_route) { - route->table = interface_ip_resolve_v6_rtable(iface->l3_dev.dev->ifindex); + if (is_proto_route) { + route->table = (v6) ? iface->ip6table : iface->ip4table; route->flags |= DEVROUTE_SRCTABLE; } @@ -303,8 +329,12 @@ interface_ip_add_route(struct interface *iface, struct blob_attr *attr, bool v6) route->flags |= DEVROUTE_TABLE; } - if ((cur = tb[ROUTE_VALID]) != NULL) - route->valid_until = system_get_rtime() + blobmsg_get_u32(cur); + if ((cur = tb[ROUTE_VALID]) != NULL) { + int64_t valid = blobmsg_get_u32(cur); + int64_t valid_until = valid + (int64_t)system_get_rtime(); + if (valid_until <= LONG_MAX && valid != 0xffffffffLL) // Catch overflow + route->valid_until = valid_until; + } vlist_add(&ip->route, &route->node, route); return; @@ -340,7 +370,7 @@ route_cmp(const void *k1, const void *k2, void *ptr) 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)); } @@ -382,6 +412,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; @@ -422,7 +453,16 @@ interface_update_proto_addr(struct vlist_tree *tree, 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); + 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); } @@ -435,7 +475,12 @@ interface_update_proto_addr(struct vlist_tree *tree, 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); + 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); @@ -520,41 +565,6 @@ 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; @@ -580,8 +590,6 @@ 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) { @@ -591,8 +599,6 @@ 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); } } @@ -656,16 +662,33 @@ static void interface_update_prefix_assignments(struct device_prefix *prefix, bo list_add(&c->head, &prefix->assignments); } + bool assigned_any = false; struct list_head assign_later = LIST_HEAD_INIT(assign_later); vlist_for_each_element(&interfaces, iface, node) { - if (iface->config_ip.assignment_length < 48 || - iface->config_ip.assignment_length > 64) + if (iface->assignment_length < 48 || + iface->assignment_length > 64) continue; + // Test whether there is a matching class + if (!list_empty(&iface->assignment_classes)) { + bool found = false; + + struct interface_assignment_class *c; + list_for_each_entry(c, &iface->assignment_classes, head) { + if (!strcmp(c->name, prefix->pclass)) { + found = true; + break; + } + } + + if (!found) + continue; + } + size_t namelen = strlen(iface->name) + 1; c = malloc(sizeof(*c) + namelen); - c->length = iface->config_ip.assignment_length; - c->assigned = iface->config_ip.assignment_hint; + c->length = iface->assignment_length; + c->assigned = iface->assignment_hint; c->enabled = false; memcpy(c->name, iface->name, namelen); @@ -678,6 +701,9 @@ static void interface_update_prefix_assignments(struct device_prefix *prefix, bo } list_add_tail(&c->head, &assign_later); } + + if (c->assigned != -1) + assigned_any = true; } // Then try to assign all other + failed custom assignments @@ -694,12 +720,18 @@ static void interface_update_prefix_assignments(struct device_prefix *prefix, bo netifd_log_message(L_WARNING, "Failed to assign subprefix " "of size %hhu for %s\n", c->length, c->name); free(c); + } else { + assigned_any = true; } } list_for_each_entry(c, &prefix->assignments, head) if ((iface = vlist_find(&interfaces, c->name, iface, node))) interface_set_prefix_address(c, prefix, iface, true); + + if (!assigned_any) + netifd_log_message(L_WARNING, "You have delegated IPv6-prefixes but haven't assigned them " + "to any interface. Did you forget to set option ip6assign on your lan-interfaces?"); } @@ -746,8 +778,8 @@ interface_update_prefix(struct vlist_tree *tree, // 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); + set_ip_source_policy(true, true, IPRULE_PRIORITY_NW, &route.addr, + route.mask, prefix_new->iface); interface_update_prefix_assignments(prefix_new, true); @@ -756,8 +788,8 @@ interface_update_prefix(struct vlist_tree *tree, // Remove null-route if (prefix_old->iface) - set_ipv6_source_policy(false, &route.addr, route.mask, - prefix_old->iface->l3_dev.dev->ifindex); + set_ip_source_policy(false, true, IPRULE_PRIORITY_NW, &route.addr, + route.mask, prefix_old->iface); system_del_route(NULL, &route); } @@ -774,9 +806,12 @@ interface_update_prefix(struct vlist_tree *tree, struct device_prefix* interface_ip_add_device_prefix(struct interface *iface, struct in6_addr *addr, uint8_t length, time_t valid_until, time_t preferred_until, - struct in6_addr *excl_addr, uint8_t excl_length) + struct in6_addr *excl_addr, uint8_t excl_length, const char *pclass) { - struct device_prefix *prefix = calloc(1, sizeof(*prefix)); + if (!pclass) + pclass = (iface) ? iface->name : "local"; + + struct device_prefix *prefix = calloc(1, sizeof(*prefix) + strlen(pclass) + 1); prefix->length = length; prefix->addr = *addr; prefix->preferred_until = preferred_until; @@ -789,6 +824,8 @@ interface_ip_add_device_prefix(struct interface *iface, struct in6_addr *addr, prefix->excl_length = excl_length; } + strcpy(prefix->pclass, pclass); + if (iface) vlist_add(&iface->proto_ip.prefix, &prefix->node, &prefix->addr); else @@ -825,15 +862,10 @@ interface_ip_set_ula_prefix(const char *prefix) interface_update_prefix(NULL, NULL, &ula_prefix->node); ula_prefix = interface_ip_add_device_prefix(NULL, &addr, length, - 0, 0, NULL, 0); + 0, 0, NULL, 0, NULL); } } -int interface_ip_resolve_v6_rtable(int ifindex) -{ - return ifindex + 1000; -} - void interface_add_dns_server(struct interface_ip_settings *ip, const char *str) { @@ -1028,6 +1060,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