return iface;
}
+static void
+interface_set_route_info(struct interface *iface, struct device_route *route)
+{
+ bool v6 = ((route->flags & DEVADDR_FAMILY) == DEVADDR_INET6);
+
+ if (!iface)
+ return;
+
+ if (!(route->flags & DEVROUTE_METRIC))
+ route->metric = iface->metric;
+
+ if (!(route->flags & DEVROUTE_TABLE)) {
+ route->table = (v6) ? iface->ip6table : iface->ip4table;
+ if (route->table)
+ route->flags |= DEVROUTE_SRCTABLE;
+ }
+}
+
void
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_proto_route = !!iface;
blobmsg_parse(route_attr, __ROUTE_MAX, tb, blobmsg_data(attr), blobmsg_data_len(attr));
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);
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;
- }
-
if ((cur = tb[ROUTE_TABLE]) != NULL) {
if (!system_resolve_rt_table(blobmsg_data(cur), &route->table)) {
DPRINTF("Failed to resolve routing table: %s\n", (char *) blobmsg_data(cur));
route->flags |= DEVROUTE_TYPE;
}
+ interface_set_route_info(iface, route);
vlist_add(&ip->route, &route->node, route);
return;
interface_handle_subnet_route(struct interface *iface, struct device_addr *addr, bool add)
{
struct device *dev = iface->l3_dev.dev;
- struct device_route route;
+ struct device_route *r = &addr->subnet;
if (addr->flags & DEVADDR_OFFLINK)
return;
- memset(&route, 0, sizeof(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);
+ if (!add) {
+ if (!addr->subnet.iface)
+ return;
- route.flags &= ~DEVADDR_KERNEL;
- route.metric = iface->metric;
- system_add_route(dev, &route);
- } else {
- system_del_route(dev, &route);
+ system_del_route(dev, r);
+ memset(r, 0, sizeof(*r));
+ return;
}
+
+ r->iface = iface;
+ r->flags = addr->flags;
+ r->mask = addr->mask;
+ memcpy(&r->addr, &addr->addr, sizeof(r->addr));
+ clear_if_addr(&r->addr, r->mask);
+
+ r->flags |= DEVADDR_KERNEL;
+ system_del_route(dev, r);
+
+ r->flags &= ~DEVADDR_KERNEL;
+ interface_set_route_info(iface, r);
+
+ system_add_route(dev, r);
}
static void
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);
+ }
}
}
}
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).
- if (table) {
+ if (a_old->policy_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);
- }
+ (v6) ? 128 : 32, a_old->policy_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);
if (node_new) {
a_new->enabled = true;
- if (!(a_new->flags & DEVADDR_EXTERNAL) && (!keep || replace)) {
- if (system_add_address(dev, a_new))
- a_new->failed = true;
- if (!keep) {
- if ((a_new->flags & DEVADDR_FAMILY) == DEVADDR_INET6)
- v6 = true;
+ if ((a_new->flags & DEVADDR_FAMILY) == DEVADDR_INET6)
+ v6 = true;
- unsigned int table = (v6) ? iface->ip6table : iface->ip4table;
+ a_new->policy_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 (!keep || replace) {
+ if (!(a_new->flags & DEVADDR_EXTERNAL)) {
+ if (system_add_address(dev, a_new))
+ a_new->failed = true;
+
+ if (iface->metric || a_new->policy_table)
+ interface_handle_subnet_route(iface, a_new, true);
}
- if (iface->metric)
- interface_handle_subnet_route(iface, a_new, true);
+ if (!keep) {
+ if (a_new->policy_table)
+ set_ip_source_policy(true, v6, IPRULE_PRIORITY_ADDR, &a_new->addr,
+ (v6) ? 128 : 32, a_new->policy_table, NULL, NULL);
+ }
}
}
}
if (node_old && node_new)
keep = !memcmp(&route_old->nexthop, &route_new->nexthop, sizeof(route_old->nexthop)) &&
(route_old->mtu == route_new->mtu) && (route_old->type == route_new->type) &&
- (route_old->valid_until == route_new->valid_until) && !route_old->failed;
+ !route_old->failed;
if (node_old) {
if (!(route_old->flags & DEVADDR_EXTERNAL) && route_old->enabled && !keep)
route.mask = addr.mask < 64 ? 64 : addr.mask;
route.addr = addr.addr;
clear_if_addr(&route.addr, route.mask);
+ interface_set_route_info(iface, &route);
if (!add && assignment->enabled) {
time_t now = system_get_rtime();
route.metric = iface->metric;
system_add_route(l3_downlink, &route);
- if (uplink && uplink->l3_dev.dev) {
- int mtu = system_update_ipv6_mtu(
- uplink->l3_dev.dev, 0);
- if (mtu > 0)
+ 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);
}
return;
vlist_for_each_element(&ip->addr, addr, node) {
+ bool v6 = ((addr->flags & DEVADDR_FAMILY) == DEVADDR_INET6) ? true : false;
+
if (addr->enabled == enabled)
continue;
if (enabled) {
system_add_address(dev, addr);
- if (iface->metric)
+
+ addr->policy_table = (v6) ? iface->ip6table : iface->ip4table;
+ if (iface->metric || addr->policy_table)
interface_handle_subnet_route(iface, addr, true);
+
+ if (addr->policy_table)
+ set_ip_source_policy(true, v6, IPRULE_PRIORITY_ADDR, &addr->addr,
+ (v6) ? 128 : 32, addr->policy_table, NULL, NULL);
} else {
interface_handle_subnet_route(iface, addr, false);
system_del_address(dev, addr);
+
+ if (addr->policy_table)
+ set_ip_source_policy(false, v6, IPRULE_PRIORITY_ADDR, &addr->addr,
+ (v6) ? 128 : 32, addr->policy_table, NULL, NULL);
}
addr->enabled = enabled;
}
continue;
if (_enabled) {
- if (!(route->flags & DEVROUTE_METRIC))
- route->metric = ip->iface->metric;
+ interface_set_route_info(ip->iface, route);
if (system_add_route(dev, route))
route->failed = true;
if (!strcmp(a->name, ip->iface->name))
interface_set_prefix_address(a, c, ip->iface, enabled);
- if (ip->iface && ip->iface->l3_dev.dev) {
+ if (ip->iface && ip->iface->policy_rules_set != enabled &&
+ ip->iface->l3_dev.dev) {
set_ip_lo_policy(enabled, true, ip->iface);
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, 0, ip->iface, "failed_policy");
+ ip->iface->policy_rules_set = enabled;
}
}