ROUTE_VALID,
ROUTE_TABLE,
ROUTE_SOURCE,
+ ROUTE_ONLINK,
+ ROUTE_TYPE,
__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 = {
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;
}
static int set_ip_source_policy(bool add, bool v6, unsigned int priority,
const union if_addr *addr, uint8_t mask, unsigned int table,
- struct interface *in_iface, const char *action)
+ struct interface *in_iface, const char *action, bool src)
{
struct iprule rule = {
.flags = IPRULE_PRIORITY,
};
if (addr) {
- rule.flags |= IPRULE_SRC;
- rule.src_addr = *addr;
- rule.src_mask = mask;
+ if (src) {
+ rule.flags |= IPRULE_SRC;
+ rule.src_addr = *addr;
+ rule.src_mask = mask;
+ } else {
+ rule.flags |= IPRULE_DEST;
+ rule.dest_addr = *addr;
+ rule.dest_mask = mask;
+ }
}
if (table) {
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);
const char *mask = strtok_r(NULL, "/", &saveptr);
if (!addr || inet_pton(af, addr, &route->source) < 1) {
- DPRINTF("Failed to parse route source: %s\n", addr);
+ DPRINTF("Failed to parse route source: %s\n", addr ? addr : "NULL");
goto error;
}
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;
- }
+ if ((cur = tb[ROUTE_ONLINK]) != NULL && blobmsg_get_bool(cur))
+ route->flags |= DEVROUTE_ONLINK;
if ((cur = tb[ROUTE_TABLE]) != NULL) {
if (!system_resolve_rt_table(blobmsg_data(cur), &route->table)) {
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;
}
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;
+ }
+
+ interface_set_route_info(iface, route);
vlist_add(&ip->route, &route->node, route);
return;
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;
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;
- 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 (addr->flags & DEVADDR_OFFLINK)
+ return;
- if (add) {
- route.flags |= DEVADDR_KERNEL;
- system_del_route(dev, &route);
+ if (!add) {
+ if (!addr->subnet.iface)
+ return;
- if (!(addr->flags & DEVADDR_OFFLINK)) {
- 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, 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
+interface_add_addr_rules(struct device_addr *addr, bool enabled)
+{
+ bool v6 = (addr->flags & DEVADDR_FAMILY) == DEVADDR_INET6;
+
+ set_ip_source_policy(enabled, v6, IPRULE_PRIORITY_ADDR, &addr->addr,
+ (v6) ? 128 : 32, addr->policy_table, NULL, NULL,
+ true);
+ set_ip_source_policy(enabled, v6, IPRULE_PRIORITY_ADDR_MASK,
+ &addr->addr, addr->mask, addr->policy_table, NULL,
+ NULL, false);
}
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->flags & DEVADDR_FAMILY) == DEVADDR_INET6)
- v6 = true;
-
- unsigned int table = (v6) ? iface->ip6table : iface->ip4table;
-
+ if (a_old->enabled && !keep) {
//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) {
- 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);
- }
+ if (a_old->policy_table)
+ interface_add_addr_rules(a_old, false);
- 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 ((a_new->flags & DEVADDR_OFFLINK) || iface->metric)
- interface_handle_subnet_route(iface, a_new, true);
+ if (!keep) {
+ if (a_new->policy_table)
+ interface_add_addr_rules(a_new, true);
+ }
}
}
}
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->failed;
+ (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)
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,
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);
+ interface_set_route_info(iface, &route);
+
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_del_address(l3_downlink, &addr); // Work around dangling prefix routes
- system_add_address(l3_downlink, &addr);
+
if (prefix->iface) {
if (prefix->iface->ip6table)
set_ip_source_policy(false, true, IPRULE_PRIORITY_NW, &addr.addr,
- addr.mask, prefix->iface->ip6table, iface, NULL);
+ addr.mask, prefix->iface->ip6table, iface, NULL, true);
set_ip_source_policy(false, true, IPRULE_PRIORITY_REJECT, &addr.addr,
- addr.mask, 0, iface, "unreachable");
+ addr.mask, 0, iface, "unreachable", true);
}
+ 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");
+ addr.mask, 0, iface, "unreachable", true);
if (prefix->iface->ip6table)
set_ip_source_policy(true, true, IPRULE_PRIORITY_NW, &addr.addr,
- addr.mask, prefix->iface->ip6table, iface, NULL);
+ addr.mask, prefix->iface->ip6table, iface, NULL, true);
}
- 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;
}
}
// End-of-assignment sentinel
c = malloc(sizeof(*c) + 1);
+ if (!c)
+ return;
+
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
if (prefix->excl_length > 0) {
const char name[] = "!excluded";
c = malloc(sizeof(*c) + sizeof(name));
- c->assigned = ntohl(prefix->excl_addr.s6_addr32[1]) &
- ((1 << (64 - prefix->length)) - 1);
- c->length = prefix->excl_length;
- memcpy(c->name, name, sizeof(name));
- list_add(&c->head, &prefix->assignments);
+ if (c) {
+ 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);
+ }
}
bool assigned_any = false;
size_t namelen = strlen(iface->name) + 1;
c = malloc(sizeof(*c) + namelen);
+ if (!c)
+ continue;
+
c->length = iface->assignment_length;
c->assigned = iface->assignment_hint;
+ c->addr = in6addr_any;
c->enabled = false;
memcpy(c->name, iface->name, namelen);
pclass = (iface) ? iface->name : "local";
struct device_prefix *prefix = calloc(1, sizeof(*prefix) + strlen(pclass) + 1);
+ if (!prefix)
+ return NULL;
+
prefix->length = length;
prefix->addr = *addr;
prefix->preferred_until = preferred_until;
if (!str)
continue;
- if (s->af == AF_INET6 && IN6_IS_ADDR_LINKLOCAL(&s->addr))
+ 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);
}
}
-void
-interface_write_resolv_conf(void)
+/* Sorting of interface resolver entries : */
+/* Primary on interface dns_metric : lowest metric first */
+/* Secondary on interface metric : lowest metric first */
+/* Finally alphabetical order of interface names */
+static int resolv_conf_iface_cmp(const void *k1, const void *k2, void *ptr)
+{
+ const struct interface *iface1 = k1, *iface2 = k2;
+
+ if (iface1->dns_metric != iface2->dns_metric)
+ return iface1->dns_metric - iface2->dns_metric;
+
+ if (iface1->metric != iface2->metric)
+ return iface1->metric - iface2->metric;
+
+ return strcmp(iface1->name, iface2->name);
+}
+
+static void
+__interface_write_dns_entries(FILE *f)
{
struct interface *iface;
- char *path = alloca(strlen(resolv_conf) + 5);
- FILE *f;
- uint32_t crcold, crcnew;
+ struct {
+ struct avl_node node;
+ } *entry, *n_entry;
+ struct avl_tree resolv_conf_iface_entries;
- sprintf(path, "%s.tmp", resolv_conf);
- unlink(path);
- f = fopen(path, "w+");
- if (!f) {
- D(INTERFACE, "Failed to open %s for writing\n", path);
- return;
- }
+ avl_init(&resolv_conf_iface_entries, resolv_conf_iface_cmp, false, NULL);
vlist_for_each_element(&interfaces, iface, node) {
if (iface->state != IFS_UP)
if (vlist_simple_empty(&iface->proto_ip.dns_search) &&
vlist_simple_empty(&iface->proto_ip.dns_servers) &&
- vlist_simple_empty(&iface->config_ip.dns_search) &&
+ vlist_simple_empty(&iface->config_ip.dns_search) &&
vlist_simple_empty(&iface->config_ip.dns_servers))
continue;
+ entry = calloc(1, sizeof(*entry));
+ if (!entry)
+ continue;
+
+ entry->node.key = iface;
+ avl_insert(&resolv_conf_iface_entries, &entry->node);
+ }
+
+ avl_for_each_element(&resolv_conf_iface_entries, entry, node) {
+ iface = (struct interface *)entry->node.key;
+
fprintf(f, "# Interface %s\n", iface->name);
+
write_resolv_conf_entries(f, &iface->config_ip, iface->ifname);
+
if (!iface->proto_ip.no_dns)
write_resolv_conf_entries(f, &iface->proto_ip, iface->ifname);
}
+
+ avl_remove_all_elements(&resolv_conf_iface_entries, entry, node, n_entry)
+ free(entry);
+}
+
+void
+interface_write_resolv_conf(void)
+{
+ char *path = alloca(strlen(resolv_conf) + 5);
+ FILE *f;
+ uint32_t crcold, crcnew;
+
+ sprintf(path, "%s.tmp", resolv_conf);
+ unlink(path);
+ f = fopen(path, "w+");
+ if (!f) {
+ D(INTERFACE, "Failed to open %s for writing\n", path);
+ return;
+ }
+
+ __interface_write_dns_entries(f);
+
fflush(f);
rewind(f);
crcnew = crc32_file(f);
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;
vlist_for_each_element(&ip->addr, addr, node) {
+ bool v6 = ((addr->flags & DEVADDR_FAMILY) == DEVADDR_INET6) ? true : false;
+
+ if (addr->flags & DEVADDR_EXTERNAL)
+ continue;
+
if (addr->enabled == enabled)
continue;
- if (enabled)
+ if (enabled) {
system_add_address(dev, addr);
- else
+
+ 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)
+ interface_add_addr_rules(addr, true);
+ } else {
+ interface_handle_subnet_route(iface, addr, false);
system_del_address(dev, addr);
+
+ if (addr->policy_table)
+ interface_add_addr_rules(addr, false);
+ }
addr->enabled = enabled;
}
vlist_for_each_element(&ip->route, route, node) {
bool _enabled = enabled;
+ if (route->flags & DEVADDR_EXTERNAL)
+ continue;
+
if (!enable_route(ip, route))
_enabled = false;
continue;
if (_enabled) {
- if (!(route->flags & DEVROUTE_METRIC))
- route->metric = ip->iface->metric;
+ interface_set_route_info(ip->iface, route);
- system_add_route(dev, route);
+ if (system_add_route(dev, route))
+ route->failed = true;
} else
system_del_route(dev, route);
route->enabled = _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) {
+ 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");
+ NULL, 0, 0, ip->iface, "failed_policy", true);
+ ip->iface->policy_rules_set = enabled;
}
}
__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
projects / project / netifd.git / blobdiff