X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface-ip.c;h=54f56d69b291d2eb207dd596cd19039c300a7286;hp=3771b5d99b1093d2b7d6c68f38bba60295ce385f;hb=a0f133ed22dee4eccc05961f646e14ecc0514060;hpb=4106d0ced43327848791ed6182f28d461c01a4b8 diff --git a/interface-ip.c b/interface-ip.c index 3771b5d..54f56d6 100644 --- a/interface-ip.c +++ b/interface-ip.c @@ -18,6 +18,7 @@ #include #include +#include #include "netifd.h" #include "device.h" @@ -37,6 +38,8 @@ enum { ROUTE_VALID, ROUTE_TABLE, ROUTE_SOURCE, + ROUTE_ONLINK, + ROUTE_TYPE, __ROUTE_MAX }; @@ -50,6 +53,8 @@ static const struct blobmsg_policy route_attr[__ROUTE_MAX] = { [ROUTE_TABLE] = { .name = "table", .type = BLOBMSG_TYPE_STRING }, [ROUTE_VALID] = { .name = "valid", .type = BLOBMSG_TYPE_INT32 }, [ROUTE_SOURCE] = { .name = "source", .type = BLOBMSG_TYPE_STRING }, + [ROUTE_ONLINK] = { .name = "onlink", .type = BLOBMSG_TYPE_BOOL }, + [ROUTE_TYPE] = { .name = "type", .type = BLOBMSG_TYPE_STRING } }; const struct uci_blob_param_list route_attr_list = { @@ -70,8 +75,8 @@ clear_if_addr(union if_addr *a, int mask) uint8_t m_clear = (1 << (m_bytes * 8 - mask)) - 1; uint8_t *p = (uint8_t *) a; - if (m_bytes < sizeof(a)) - memset(p + m_bytes, 0, sizeof(a) - m_bytes); + if (m_bytes < sizeof(*a)) + memset(p + m_bytes, 0, sizeof(*a) - m_bytes); p[m_bytes - 1] &= ~m_clear; } @@ -128,23 +133,6 @@ static int set_ip_source_policy(bool add, bool v6, unsigned int priority, 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) { @@ -322,7 +310,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); @@ -337,14 +326,17 @@ 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); + route->sourcemask = (mask) ? atoi(mask) : ((af == AF_INET6) ? 128 : 32); } + if ((cur = tb[ROUTE_ONLINK]) != NULL && blobmsg_get_bool(cur)) + route->flags |= DEVROUTE_ONLINK; + if (is_proto_route) { route->table = (v6) ? iface->ip6table : iface->ip4table; route->flags |= DEVROUTE_SRCTABLE; @@ -356,6 +348,10 @@ interface_ip_add_route(struct interface *iface, struct blob_attr *attr, bool v6) goto error; } + /* only set the table flag if not using the main (default) table */ + if (system_is_default_rt_table(route->table)) + route->table = 0; + if (route->table) route->flags |= DEVROUTE_TABLE; } @@ -367,6 +363,14 @@ interface_ip_add_route(struct interface *iface, struct blob_attr *attr, bool v6) route->valid_until = valid_until; } + if ((cur = tb[ROUTE_TYPE]) != NULL) { + if (!system_resolve_rt_type(blobmsg_data(cur), &route->type)) { + DPRINTF("Failed to resolve routing type: %s\n", (char *) blobmsg_data(cur)); + goto error; + } + route->flags |= DEVROUTE_TYPE; + } + vlist_add(&ip->route, &route->node, route); return; @@ -398,6 +402,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; @@ -418,6 +425,9 @@ interface_handle_subnet_route(struct interface *iface, struct device_addr *addr, struct device *dev = iface->l3_dev.dev; struct device_route route; + if (addr->flags & DEVADDR_OFFLINK) + return; + memset(&route, 0, sizeof(route)); route.iface = iface; route.flags = addr->flags; @@ -429,14 +439,11 @@ interface_handle_subnet_route(struct interface *iface, struct device_addr *addr, route.flags |= DEVADDR_KERNEL; system_del_route(dev, &route); - if (!(addr->flags & DEVADDR_OFFLINK)) { - route.flags &= ~DEVADDR_KERNEL; - route.metric = iface->metric; - system_add_route(dev, &route); - } + route.flags &= ~DEVADDR_KERNEL; + route.metric = iface->metric; + system_add_route(dev, &route); } else { - if (!(addr->flags & DEVADDR_OFFLINK)) - system_del_route(dev, &route); + system_del_route(dev, &route); } } @@ -457,17 +464,26 @@ 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); if ((a_new->flags & DEVADDR_FAMILY) == DEVADDR_INET4 && !a_new->broadcast) { - uint32_t mask = ~0; - uint32_t *a = (uint32_t *) &a_new->addr; + /* /31 and /32 addressing need 255.255.255.255 + * as broadcast address. */ + if (a_new->mask >= 31) { + a_new->broadcast = (uint32_t) ~0; + } else { + uint32_t mask = ~0; + uint32_t *a = (uint32_t *) &a_new->addr; - mask >>= a_new->mask; - a_new->broadcast = *a | htonl(mask); + mask >>= a_new->mask; + a_new->broadcast = *a | htonl(mask); + } } } @@ -477,7 +493,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 || @@ -490,23 +506,29 @@ 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->enabled && !keep) { 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); + + if (a_old->mask != ((v6) ? 128 : 32)) + set_ip_source_policy(false, v6, IPRULE_PRIORITY_NW, &a_old->addr, + a_old->mask, table, NULL, NULL); + } - system_del_address(dev, a_old); + if (!(a_old->flags & DEVADDR_EXTERNAL)) { + interface_handle_subnet_route(iface, a_old, false); + system_del_address(dev, a_old); + } } free(a_old->pclass); free(a_old); @@ -514,23 +536,30 @@ interface_update_proto_addr(struct vlist_tree *tree, if (node_new) { a_new->enabled = true; - if (!(a_new->flags & DEVADDR_EXTERNAL) && (!keep || replace)) { - system_add_address(dev, a_new); + if (!keep || replace) { + if (!(a_new->flags & DEVADDR_EXTERNAL)) { + if (system_add_address(dev, a_new)) + a_new->failed = true; + + if (iface->metric) + interface_handle_subnet_route(iface, a_new, 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); - if ((a_new->flags & DEVADDR_OFFLINK) || iface->metric) - interface_handle_subnet_route(iface, a_new, true); + if (a_new->mask != ((v6) ? 128 : 32)) + set_ip_source_policy(true, v6, IPRULE_PRIORITY_NW, &a_new->addr, + a_new->mask, table, NULL, NULL); + } + } } } } @@ -559,12 +588,16 @@ 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)) && - (route_old->table == route_new->table); + (route_old->mtu == route_new->mtu) && (route_old->type == route_new->type) && + !route_old->failed; if (node_old) { if (!(route_old->flags & DEVADDR_EXTERNAL) && route_old->enabled && !keep) @@ -576,11 +609,9 @@ interface_update_proto_route(struct vlist_tree *tree, 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; @@ -607,10 +638,62 @@ 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; + } } +static void +random_ifaceid(struct in6_addr *addr) +{ + static bool initialized = false; + struct timeval t; + + if (!initialized) { + long int seed = 0; + gettimeofday(&t, NULL); + seed = t.tv_sec ^ t.tv_usec ^ getpid(); + srand48(seed); + initialized = true; + } + addr->s6_addr32[2] = (uint32_t)mrand48(); + addr->s6_addr32[3] = (uint32_t)mrand48(); +} + +static void +eui64_ifaceid(struct interface *iface, struct in6_addr *addr) +{ + /* get mac address */ + uint8_t *macaddr = iface->l3_dev.dev->settings.macaddr; + uint8_t *ifaceid = addr->s6_addr + 8; + memcpy(ifaceid,macaddr,3); + memcpy(ifaceid + 5,macaddr + 3, 3); + ifaceid[3] = 0xff; + ifaceid[4] = 0xfe; + ifaceid[0] ^= 0x02; +} + +static void +generate_ifaceid(struct interface *iface, struct in6_addr *addr) +{ + /* generate new iface id */ + switch (iface->assignment_iface_id_selection) { + case IFID_FIXED: + /* fixed */ + /* copy host part from assignment_fixed_iface_id */ + memcpy(addr->s6_addr + 8, iface->assignment_fixed_iface_id.s6_addr + 8, 8); + break; + case IFID_RANDOM: + /* randomize last 64 bits */ + random_ifaceid(addr); + break; + case IFID_EUI64: + /* eui64 */ + eui64_ifaceid(iface, addr); + break; + } +} static void interface_set_prefix_address(struct device_prefix_assignment *assignment, @@ -623,45 +706,71 @@ interface_set_prefix_address(struct device_prefix_assignment *assignment, struct device *l3_downlink = iface->l3_dev.dev; struct device_addr addr; + struct device_route route; memset(&addr, 0, sizeof(addr)); - addr.addr.in6 = prefix->addr; - addr.addr.in6.s6_addr32[1] |= htonl(assignment->assigned); - addr.addr.in6.s6_addr[15] += 1; + memset(&route, 0, sizeof(route)); + + if (IN6_IS_ADDR_UNSPECIFIED(&assignment->addr)) { + addr.addr.in6 = prefix->addr; + addr.addr.in6.s6_addr32[1] |= htonl(assignment->assigned); + generate_ifaceid(iface, &addr.addr.in6); + assignment->addr = addr.addr.in6; + } + else + addr.addr.in6 = assignment->addr; + addr.mask = assignment->length; - addr.flags = DEVADDR_INET6; + addr.flags = DEVADDR_INET6 | DEVADDR_OFFLINK; addr.preferred_until = prefix->preferred_until; addr.valid_until = prefix->valid_until; + route.flags = DEVADDR_INET6; + route.mask = addr.mask < 64 ? 64 : addr.mask; + route.addr = addr.addr; + clear_if_addr(&route.addr, route.mask); + if (!add && assignment->enabled) { time_t now = system_get_rtime(); addr.preferred_until = now; if (!addr.valid_until || addr.valid_until - now > 7200) addr.valid_until = now + 7200; - 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_del_route(l3_downlink, &route); system_add_address(l3_downlink, &addr); + + assignment->enabled = false; + } 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( - uplink->l3_dev.dev, 0); - if (mtu > 0) + + route.metric = iface->metric; + system_add_route(l3_downlink, &route); + + if (uplink && uplink->l3_dev.dev && !(l3_downlink->settings.flags & DEV_OPT_MTU6)) { + int mtu = system_update_ipv6_mtu(uplink->l3_dev.dev, 0); + int mtu_old = system_update_ipv6_mtu(l3_downlink, 0); + + if (mtu > 0 && mtu_old > mtu) system_update_ipv6_mtu(l3_downlink, mtu); } + assignment->enabled = true; } } @@ -713,6 +822,7 @@ static void interface_update_prefix_assignments(struct device_prefix *prefix, bo c->assigned = 1 << (64 - prefix->length); c->length = 64; c->name[0] = 0; + c->addr = in6addr_any; list_add(&c->head, &prefix->assignments); // Excluded prefix @@ -722,6 +832,7 @@ static void interface_update_prefix_assignments(struct device_prefix *prefix, bo c->assigned = ntohl(prefix->excl_addr.s6_addr32[1]) & ((1 << (64 - prefix->length)) - 1); c->length = prefix->excl_length; + c->addr = in6addr_any; memcpy(c->name, name, sizeof(name)); list_add(&c->head, &prefix->assignments); } @@ -753,6 +864,7 @@ static void interface_update_prefix_assignments(struct device_prefix *prefix, bo c = malloc(sizeof(*c) + namelen); c->length = iface->assignment_length; c->assigned = iface->assignment_hint; + c->addr = in6addr_any; c->enabled = false; memcpy(c->name, iface->name, namelen); @@ -829,6 +941,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; @@ -1009,7 +1125,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; @@ -1021,7 +1137,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) { @@ -1056,9 +1175,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); @@ -1085,9 +1204,11 @@ void interface_ip_set_enabled(struct interface_ip_settings *ip, bool enabled) struct device_addr *addr; struct device_route *route; struct device *dev; + struct interface *iface; ip->enabled = enabled; - dev = ip->iface->l3_dev.dev; + iface = ip->iface; + dev = iface->l3_dev.dev; if (!dev) return; @@ -1095,10 +1216,14 @@ void interface_ip_set_enabled(struct interface_ip_settings *ip, bool enabled) if (addr->enabled == enabled) continue; - if (enabled) + if (enabled) { system_add_address(dev, addr); - else + if (iface->metric) + interface_handle_subnet_route(iface, addr, true); + } else { + interface_handle_subnet_route(iface, addr, false); system_del_address(dev, addr); + } addr->enabled = enabled; } @@ -1115,7 +1240,17 @@ 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 (!(route->flags & DEVROUTE_TABLE)) { + route->flags &= ~DEVROUTE_SRCTABLE; + route->table = ((route->flags & DEVADDR_FAMILY) == DEVADDR_INET6) ? + iface->ip6table : iface->ip4table; + + if (route->table) + route->flags |= DEVROUTE_SRCTABLE; + } + + if (system_add_route(dev, route)) + route->failed = true; } else system_del_route(dev, route); route->enabled = _enabled; @@ -1128,13 +1263,9 @@ void interface_ip_set_enabled(struct interface_ip_settings *ip, bool enabled) if (!strcmp(a->name, ip->iface->name)) interface_set_prefix_address(a, c, ip->iface, enabled); - if (ip->iface && ip->iface->l3_dev.dev) { - set_ip_lo_policy(enabled, true, ip->iface); - set_ip_lo_policy(enabled, false, ip->iface); - + if (ip->iface && ip->iface->l3_dev.dev) set_ip_source_policy(enabled, true, IPRULE_PRIORITY_REJECT + ip->iface->l3_dev.dev->ifindex, NULL, 0, 0, ip->iface, "failed_policy"); - } } void @@ -1190,7 +1321,6 @@ interface_ip_init(struct interface *iface) __interface_ip_init(&iface->proto_ip, iface); __interface_ip_init(&iface->config_ip, iface); vlist_init(&iface->host_routes, route_cmp, interface_update_host_route); - } static void