/*
* netifd - network interface daemon
* Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2012 Steven Barth <steven@midlink.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2
if (defaultroute_target)
free(route);
else
- vlist_add(&iface->host_routes, &route->node, &route->flags);
+ vlist_add(&iface->host_routes, &route->node, route);
return iface;
}
if ((cur = tb[ROUTE_VALID]) != NULL)
route->valid_until = system_get_rtime() + blobmsg_get_u32(cur);
- vlist_add(&ip->route, &route->node, &route->flags);
+ vlist_add(&ip->route, &route->node, route);
return;
error:
static int
route_cmp(const void *k1, const void *k2, void *ptr)
{
- return memcmp(k1, k2, sizeof(struct device_route) -
- offsetof(struct device_route, flags));
+ const struct device_route *r1 = k1, *r2 = k2;
+
+ if (r1->mask != r2->mask)
+ return r2->mask - r1->mask;
+
+ if (r1->metric != r2->metric)
+ return r1->metric - r2->metric;
+
+ if (r1->flags != r2->flags)
+ return r2->flags - r1->flags;
+
+ return memcmp(&r1->addr, &r2->addr, sizeof(r1->addr));
}
static int
}
+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)
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) {
system_update_ipv6_mtu(l3_downlink, mtu);
}
assignment->enabled = true;
+
+ interface_trigger_ula_prefix(iface, prefix, false);
}
}
if (node_old && node_new) {
// Move assignments and refresh addresses to update valid times
- list_splice_init(&prefix_old->assignments, &prefix_new->assignments);
+ list_splice(&prefix_old->assignments, &prefix_new->assignments);
list_for_each_entry(c, &prefix_new->assignments, head)
if ((iface = vlist_find(&interfaces, c->name, iface, node)))
// Set null-route to avoid routing loops
system_add_route(NULL, &route);
- INIT_LIST_HEAD(&prefix_new->assignments);
interface_update_prefix_assignments(prefix_new, true);
} else if (node_old) {
interface_update_prefix_assignments(prefix_old, false);
prefix->preferred_until = preferred_until;
prefix->valid_until = valid_until;
prefix->iface = iface;
+ INIT_LIST_HEAD(&prefix->assignments);
if (excl_addr) {
prefix->excl_addr = *excl_addr;