X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface-ip.c;h=fa84fc76ed0a63f13dabb09f8e53fcb20b9932d2;hp=914ec07132d5a2a7706e2a757eabf7d53acfbf01;hb=55c7d8f55b6bdb264a52410467a7e8cff3bec3a9;hpb=46d52638f04c471a0e86d07ccae6a188f1a05ef5 diff --git a/interface-ip.c b/interface-ip.c index 914ec07..fa84fc7 100644 --- a/interface-ip.c +++ b/interface-ip.c @@ -1,3 +1,16 @@ +/* + * netifd - network interface daemon + * Copyright (C) 2012 Felix Fietkau + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ #include #include #include @@ -37,6 +50,140 @@ const struct config_param_list route_attr_list = { .params = route_attr, }; +static void +clear_if_addr(union if_addr *a, int mask) +{ + int m_bytes = (mask + 7) / 8; + 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); + + p[m_bytes - 1] &= ~m_clear; +} + +static bool +match_if_addr(union if_addr *a1, union if_addr *a2, int mask) +{ + union if_addr *p1, *p2; + + p1 = alloca(sizeof(*a1)); + p2 = alloca(sizeof(*a2)); + + memcpy(p1, a1, sizeof(*a1)); + clear_if_addr(p1, mask); + memcpy(p2, a2, sizeof(*a2)); + clear_if_addr(p2, mask); + + return !memcmp(p1, p2, sizeof(*p1)); +} + +static bool +__find_ip_addr_target(struct interface_ip_settings *ip, union if_addr *a, bool v6) +{ + struct device_addr *addr; + + vlist_for_each_element(&ip->addr, addr, node) { + if (!addr->enabled) + continue; + + if (v6 != ((addr->flags & DEVADDR_FAMILY) == DEVADDR_INET6)) + continue; + + if (!match_if_addr(&addr->addr, a, addr->mask)) + continue; + + return true; + } + + return false; +} + +static void +__find_ip_route_target(struct interface_ip_settings *ip, union if_addr *a, + bool v6, struct device_route **res) +{ + struct device_route *route; + + vlist_for_each_element(&ip->route, route, node) { + if (!route->enabled) + continue; + + if (v6 != ((route->flags & DEVADDR_FAMILY) == DEVADDR_INET6)) + continue; + + if (!match_if_addr(&route->addr, a, route->mask)) + continue; + + if (!*res || route->mask < (*res)->mask) + *res = route; + } +} + +static bool +interface_ip_find_addr_target(struct interface *iface, union if_addr *a, bool v6) +{ + return __find_ip_addr_target(&iface->proto_ip, a, v6) || + __find_ip_addr_target(&iface->config_ip, a, v6); +} + +static void +interface_ip_find_route_target(struct interface *iface, union if_addr *a, + bool v6, struct device_route **route) +{ + __find_ip_route_target(&iface->proto_ip, a, v6, route); + __find_ip_route_target(&iface->config_ip, a, v6, route); +} + +struct interface * +interface_ip_add_target_route(union if_addr *addr, bool v6) +{ + struct interface *iface; + struct device_route *route, *r_next = NULL; + bool defaultroute_target = false; + int addrsize = v6 ? sizeof(addr->in6) : sizeof(addr->in); + + route = calloc(1, sizeof(*route)); + if (!route) + return NULL; + + route->flags = v6 ? DEVADDR_INET6 : DEVADDR_INET4; + route->mask = v6 ? 128 : 32; + if (memcmp(&route->addr, addr, addrsize) == 0) + defaultroute_target = true; + else + memcpy(&route->addr, addr, addrsize); + + 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) { + free(route); + return NULL; + } + + iface = r_next->iface; + memcpy(&route->nexthop, &r_next->nexthop, sizeof(route->nexthop)); + route->mtu = r_next->mtu; + route->metric = r_next->metric; + +done: + route->iface = iface; + if (defaultroute_target) + free(route); + else + vlist_add(&iface->host_routes, &route->node, &route->flags); + return iface; +} + void interface_ip_add_route(struct interface *iface, struct blob_attr *attr, bool v6) { @@ -73,7 +220,7 @@ interface_ip_add_route(struct interface *iface, struct blob_attr *attr, bool v6) } if ((cur = tb[ROUTE_TARGET]) != NULL) { - if (!inet_pton(af, blobmsg_data(cur), &route->addr)) { + if (!parse_ip_and_netmask(af, blobmsg_data(cur), &route->addr, &route->mask)) { DPRINTF("Failed to parse route target: %s\n", (char *) blobmsg_data(cur)); goto error; } @@ -91,8 +238,10 @@ interface_ip_add_route(struct interface *iface, struct blob_attr *attr, bool v6) route->flags |= DEVROUTE_METRIC; } - if ((cur = tb[ROUTE_MTU]) != NULL) + if ((cur = tb[ROUTE_MTU]) != NULL) { route->mtu = blobmsg_get_u32(cur); + route->flags |= DEVROUTE_MTU; + } vlist_add(&ip->route, &route->node, &route->flags); return; @@ -116,6 +265,30 @@ route_cmp(const void *k1, const void *k2, void *ptr) } static void +interface_handle_subnet_route(struct interface *iface, struct device_addr *addr, bool add) +{ + struct device *dev = iface->l3_dev.dev; + struct device_route route; + + route.iface = iface; + route.flags = addr->flags; + route.mask = addr->mask; + memcpy(&route.addr, &addr->addr, sizeof(route.addr)); + clear_if_addr(&route.addr, route.mask); + + if (add) { + route.flags |= DEVADDR_KERNEL; + system_del_route(dev, &route); + + route.flags &= ~DEVADDR_KERNEL; + route.metric = iface->metric; + system_add_route(dev, &route); + } else { + system_del_route(dev, &route); + } +} + +static void interface_update_proto_addr(struct vlist_tree *tree, struct vlist_node *node_new, struct vlist_node *node_old) @@ -140,7 +313,7 @@ interface_update_proto_addr(struct vlist_tree *tree, uint32_t *a = (uint32_t *) &a_new->addr; mask >>= a_new->mask; - a_new->broadcast = *a | mask; + a_new->broadcast = *a | htonl(mask); } } @@ -159,15 +332,20 @@ interface_update_proto_addr(struct vlist_tree *tree, } if (node_old) { - if (!(a_old->flags & DEVADDR_EXTERNAL) && a_old->enabled && !keep) + if (!(a_old->flags & DEVADDR_EXTERNAL) && a_old->enabled && !keep) { + interface_handle_subnet_route(iface, a_old, false); system_del_address(dev, a_old); + } free(a_old); } if (node_new) { - if (!(a_new->flags & DEVADDR_EXTERNAL) && !keep) - system_add_address(dev, a_new); a_new->enabled = true; + if (!(a_new->flags & DEVADDR_EXTERNAL) && !keep) { + system_add_address(dev, a_new); + if (iface->metric) + interface_handle_subnet_route(iface, a_new, true); + } } } @@ -210,6 +388,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); @@ -218,6 +399,30 @@ interface_update_proto_route(struct vlist_tree *tree, } } +static void +interface_update_host_route(struct vlist_tree *tree, + struct vlist_node *node_new, + struct vlist_node *node_old) +{ + struct interface *iface; + struct device *dev; + struct device_route *route_old, *route_new; + + iface = container_of(tree, struct interface, host_routes); + dev = iface->l3_dev.dev; + + route_old = container_of(node_old, struct device_route, node); + route_new = container_of(node_new, struct device_route, node); + + if (node_old) { + system_del_route(dev, route_old); + free(route_old); + } + + if (node_new) + system_add_route(dev, route_new); +} + void interface_add_dns_server(struct interface_ip_settings *ip, const char *str) { @@ -338,7 +543,8 @@ interface_write_resolv_conf(void) fprintf(f, "# Interface %s\n", iface->name); write_resolv_conf_entries(f, &iface->config_ip); - write_resolv_conf_entries(f, &iface->proto_ip); + if (!iface->proto_ip.no_dns) + write_resolv_conf_entries(f, &iface->proto_ip); } fclose(f); if (rename(path, resolv_conf) < 0) { @@ -392,8 +598,10 @@ void interface_ip_set_enabled(struct interface_ip_settings *ip, bool enabled) void interface_ip_update_start(struct interface_ip_settings *ip) { - vlist_simple_update(&ip->dns_servers); - vlist_simple_update(&ip->dns_search); + if (ip != &ip->iface->config_ip) { + vlist_simple_update(&ip->dns_servers); + vlist_simple_update(&ip->dns_search); + } vlist_update(&ip->route); vlist_update(&ip->addr); } @@ -410,14 +618,16 @@ interface_ip_update_complete(struct interface_ip_settings *ip) void interface_ip_flush(struct interface_ip_settings *ip) { + if (ip == &ip->iface->proto_ip) + vlist_flush_all(&ip->iface->host_routes); vlist_simple_flush_all(&ip->dns_servers); vlist_simple_flush_all(&ip->dns_search); vlist_flush_all(&ip->route); vlist_flush_all(&ip->addr); } -void -interface_ip_init(struct interface_ip_settings *ip, struct interface *iface) +static void +__interface_ip_init(struct interface_ip_settings *ip, struct interface *iface) { ip->iface = iface; ip->enabled = true; @@ -426,3 +636,11 @@ interface_ip_init(struct interface_ip_settings *ip, struct interface *iface) vlist_init(&ip->route, route_cmp, interface_update_proto_route); vlist_init(&ip->addr, addr_cmp, interface_update_proto_addr); } + +void +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); +}