X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface-ip.c;h=33b5d4326d3b3ecf20026201f8382533577bf65b;hp=084688c61c8e1921401784d44f3a948d5893b124;hb=4b7662c5841214c105a174fdc9ab9fac870abab9;hpb=f80b9e4acc47cf454768b44142495fdb8a68a39f diff --git a/interface-ip.c b/interface-ip.c index 084688c..33b5d43 100644 --- a/interface-ip.c +++ b/interface-ip.c @@ -18,6 +18,7 @@ #include #include +#include #include "netifd.h" #include "device.h" @@ -59,7 +60,6 @@ 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; @@ -197,72 +197,6 @@ __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) { @@ -389,7 +323,8 @@ interface_ip_add_route(struct interface *iface, struct blob_attr *attr, bool v6) if ((cur = tb[ROUTE_METRIC]) != NULL) { route->metric = blobmsg_get_u32(cur); route->flags |= DEVROUTE_METRIC; - } + } else + route->metric = iface->metric; if ((cur = tb[ROUTE_MTU]) != NULL) { route->mtu = blobmsg_get_u32(cur); @@ -404,13 +339,15 @@ interface_ip_add_route(struct interface *iface, struct blob_attr *attr, bool v6) const char *addr = strtok_r(source, "/", &saveptr); const char *mask = strtok_r(NULL, "/", &saveptr); - if (inet_pton(af, addr, &route->source) < 1) { + if (!addr || 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->sourcemask = (mask) ? atoi(mask) : ((af == AF_INET6) ? 128 : 32); + } + + if (is_proto_route) { route->table = (v6) ? iface->ip6table : iface->ip4table; route->flags |= DEVROUTE_SRCTABLE; } @@ -432,11 +369,6 @@ 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; @@ -468,6 +400,9 @@ route_cmp(const void *k1, const void *k2, void *ptr) if (r1->sourcemask != r2->sourcemask) return r1->sourcemask - r2->sourcemask; + if (r1->table != r2->table) + return r1->table - r2->table; + int maskcmp = memcmp(&r1->source, &r2->source, sizeof(r1->source)); if (maskcmp) return maskcmp; @@ -527,6 +462,9 @@ interface_update_proto_addr(struct vlist_tree *tree, iface = ip->iface; dev = iface->l3_dev.dev; + if (!node_new || !node_old) + iface->updated |= IUF_ADDRESS; + if (node_new) { a_new = container_of(node_new, struct device_addr, node); @@ -547,7 +485,7 @@ interface_update_proto_addr(struct vlist_tree *tree, if (a_new && a_old) { keep = true; - if (a_old->flags != a_new->flags) + if (a_old->flags != a_new->flags || a_old->failed) keep = false; if (a_old->valid_until != a_new->valid_until || @@ -566,36 +504,43 @@ interface_update_proto_addr(struct vlist_tree *tree, if ((a_old->flags & DEVADDR_FAMILY) == DEVADDR_INET6) v6 = true; + unsigned int table = (v6) ? iface->ip6table : iface->ip4table; + //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, (v6) ? iface->ip6table : iface->ip4table, - NULL, NULL); - set_ip_source_policy(false, v6, IPRULE_PRIORITY_NW, &a_old->addr, - a_old->mask, (v6) ? iface->ip6table : iface->ip4table, NULL, NULL); + if (table) { + set_ip_source_policy(false, v6, IPRULE_PRIORITY_ADDR, &a_old->addr, + (v6) ? 128 : 32, table, NULL, NULL); + set_ip_source_policy(false, v6, IPRULE_PRIORITY_NW, &a_old->addr, + a_old->mask, table, NULL, NULL); + } system_del_address(dev, a_old); } + free(a_old->pclass); free(a_old); } if (node_new) { a_new->enabled = true; if (!(a_new->flags & DEVADDR_EXTERNAL) && (!keep || replace)) { - system_add_address(dev, a_new); + if (system_add_address(dev, a_new)) + a_new->failed = 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, (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); + unsigned int table = (v6) ? iface->ip6table : iface->ip4table; + + if (table) { + set_ip_source_policy(true, v6, IPRULE_PRIORITY_ADDR, &a_new->addr, + (v6) ? 128 : 32, table, NULL, NULL); + set_ip_source_policy(true, v6, IPRULE_PRIORITY_NW, &a_new->addr, + a_new->mask, table, NULL, NULL); + } } if ((a_new->flags & DEVADDR_OFFLINK) || iface->metric) @@ -628,28 +573,29 @@ interface_update_proto_route(struct vlist_tree *tree, iface = ip->iface; dev = iface->l3_dev.dev; + if (!node_new || !node_old) + iface->updated |= IUF_ROUTE; + route_old = container_of(node_old, struct device_route, node); route_new = container_of(node_new, struct device_route, node); if (node_old && node_new) - keep = !memcmp(&route_old->nexthop, &route_new->nexthop, sizeof(route_old->nexthop)); + keep = !memcmp(&route_old->nexthop, &route_new->nexthop, sizeof(route_old->nexthop)) && + (route_old->mtu == route_new->mtu) && !route_old->failed; 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); } if (node_new) { bool _enabled = enable_route(ip, route_new); - if (!(route_new->flags & DEVROUTE_METRIC)) - route_new->metric = iface->metric; - if (!(route_new->flags & DEVADDR_EXTERNAL) && !keep && _enabled) - system_add_route(dev, route_new); + if (system_add_route(dev, route_new)) + route_new->failed = true; route_new->iface = iface; route_new->enabled = _enabled; @@ -676,8 +622,10 @@ interface_update_host_route(struct vlist_tree *tree, free(route_old); } - if (node_new) - system_add_route(dev, route_new); + if (node_new) { + if (system_add_route(dev, route_new)) + route_new->failed = true; + } } @@ -706,24 +654,27 @@ interface_set_prefix_address(struct device_prefix_assignment *assignment, addr.preferred_until = now; if (!addr.valid_until || addr.valid_until - now > 7200) addr.valid_until = now + 7200; + system_del_address(l3_downlink, &addr); // Work around dangling prefix routes system_add_address(l3_downlink, &addr); if (prefix->iface) { - set_ip_source_policy(false, true, IPRULE_PRIORITY_NW, &addr.addr, - addr.mask, prefix->iface->ip6table, iface, NULL); + if (prefix->iface->ip6table) + set_ip_source_policy(false, true, IPRULE_PRIORITY_NW, &addr.addr, + addr.mask, prefix->iface->ip6table, iface, NULL); set_ip_source_policy(false, true, IPRULE_PRIORITY_REJECT, &addr.addr, addr.mask, 0, iface, "unreachable"); } assignment->enabled = false; - } else if (add && (iface->state == IFS_UP || iface->state == IFS_SETUP)) { - system_add_address(l3_downlink, &addr); + } else if (add && (iface->state == IFS_UP || iface->state == IFS_SETUP) && + !system_add_address(l3_downlink, &addr)) { if (prefix->iface && !assignment->enabled) { set_ip_source_policy(true, true, IPRULE_PRIORITY_REJECT, &addr.addr, addr.mask, 0, iface, "unreachable"); - set_ip_source_policy(true, true, IPRULE_PRIORITY_NW, &addr.addr, - addr.mask, prefix->iface->ip6table, iface, NULL); + if (prefix->iface->ip6table) + set_ip_source_policy(true, true, IPRULE_PRIORITY_NW, &addr.addr, + addr.mask, prefix->iface->ip6table, iface, NULL); } if (uplink && uplink->l3_dev.dev) { int mtu = system_update_ipv6_mtu( @@ -898,6 +849,10 @@ interface_update_prefix(struct vlist_tree *tree, prefix_old = container_of(node_old, struct device_prefix, node); prefix_new = container_of(node_new, struct device_prefix, node); + struct interface_ip_settings *ip = container_of(tree, struct interface_ip_settings, prefix); + if (tree && (!node_new || !node_old)) + ip->iface->updated |= IUF_PREFIX; + struct device_route route; memset(&route, 0, sizeof(route)); route.flags = DEVADDR_INET6; @@ -1078,7 +1033,7 @@ interface_add_dns_search_list(struct interface_ip_settings *ip, struct blob_attr } static void -write_resolv_conf_entries(FILE *f, struct interface_ip_settings *ip) +write_resolv_conf_entries(FILE *f, struct interface_ip_settings *ip, const char *dev) { struct dns_server *s; struct dns_search_domain *d; @@ -1090,7 +1045,10 @@ write_resolv_conf_entries(FILE *f, struct interface_ip_settings *ip) if (!str) continue; - fprintf(f, "nameserver %s\n", str); + if (s->af == AF_INET6 && IN6_IS_ADDR_LINKLOCAL(&s->addr.in6)) + fprintf(f, "nameserver %s%%%s\n", str, dev); + else + fprintf(f, "nameserver %s\n", str); } vlist_simple_for_each_element(&ip->dns_search, d, node) { @@ -1125,9 +1083,9 @@ interface_write_resolv_conf(void) continue; fprintf(f, "# Interface %s\n", iface->name); - write_resolv_conf_entries(f, &iface->config_ip); + write_resolv_conf_entries(f, &iface->config_ip, iface->ifname); if (!iface->proto_ip.no_dns) - write_resolv_conf_entries(f, &iface->proto_ip); + write_resolv_conf_entries(f, &iface->proto_ip, iface->ifname); } fflush(f); rewind(f); @@ -1184,7 +1142,8 @@ void interface_ip_set_enabled(struct interface_ip_settings *ip, bool enabled) if (!(route->flags & DEVROUTE_METRIC)) route->metric = ip->iface->metric; - system_add_route(dev, route); + if (system_add_route(dev, route)) + route->failed = true; } else system_del_route(dev, route); route->enabled = _enabled;