#include <string.h>
#include <stdlib.h>
#include <stdio.h>
-#include <unistd.h>
#include <limits.h>
#include <arpa/inet.h>
+#include <netinet/in.h>
#include "netifd.h"
#include "device.h"
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 = {
struct list_head prefixes = LIST_HEAD_INIT(prefixes);
-static struct list_head source_tables = LIST_HEAD_INIT(source_tables);
static struct device_prefix *ula_prefix = NULL;
static struct uloop_timeout valid_until_timeout;
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 struct device_source_table*
-find_source_table(const struct device_route *route)
-{
- struct device_source_table key = {
- .v6 = (route->flags & DEVADDR_FAMILY) == DEVADDR_INET6,
- .addr = route->source,
- .mask = route->sourcemask
- };
- struct device_source_table *c;
- list_for_each_entry(c, &source_tables, head)
- if (!memcmp(&c->v6, &key.v6, sizeof(key) -
- offsetof(struct device_source_table, v6)))
- return c;
- return NULL;
-}
-
-static uint32_t
-get_source_table(const struct device_route *route)
-{
- if (route->table || route->sourcemask == 0)
- return route->table;
-
- struct device_source_table *tbl = find_source_table(route);
-
- if (!tbl) {
- tbl = calloc(1, sizeof(*tbl));
- tbl->addr = route->source;
- tbl->mask = route->sourcemask;
- tbl->v6 = (route->flags & DEVADDR_FAMILY) == DEVADDR_INET6;
- tbl->table = IPRULE_PRIORITY_SOURCE | (((~tbl->mask) & 0x7f) << 20);
-
- struct list_head *before = NULL;
- struct device_source_table *c;
- list_for_each_entry(c, &source_tables, head) {
- if (c->table > tbl->table) {
- before = &c->head;
- break;
- } else if (c->table == tbl->table) {
- ++tbl->table;
- }
- }
-
- if (!before)
- before = &source_tables;
-
- list_add_tail(&tbl->head, before);
- set_ip_source_policy(true, tbl->v6, tbl->table, &tbl->addr,
- tbl->mask, tbl->table, NULL, NULL);
- }
-
- ++tbl->refcount;
- return tbl->table;
-}
-
-static void
-put_source_table(const struct device_route *route)
-{
- struct device_source_table *tbl = find_source_table(route);
- if (tbl && tbl->table == route->table && --tbl->refcount == 0) {
- set_ip_source_policy(false, tbl->v6, tbl->table, &tbl->addr,
- tbl->mask, tbl->table, NULL, NULL);
- list_del(&tbl->head);
- free(tbl);
- }
-}
-
static bool
interface_ip_find_addr_target(struct interface *iface, union if_addr *a, 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);
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);
- } else if (is_proto_route) {
+ 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;
}
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 (route->sourcemask) {
- route->table = get_source_table(route);
- route->flags |= DEVROUTE_SRCTABLE;
+ 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);
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;
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 && 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 ||
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);
+ set_ip_source_policy(false, v6, IPRULE_PRIORITY_NW, &a_old->addr,
+ a_old->mask, table, NULL, NULL);
+ }
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)) {
- system_add_address(dev, a_new);
+ if (system_add_address(dev, a_new))
+ a_new->failed = 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);
+ set_ip_source_policy(true, v6, IPRULE_PRIORITY_NW, &a_new->addr,
+ a_new->mask, table, NULL, NULL);
+ }
}
if ((a_new->flags & DEVADDR_OFFLINK) || iface->metric)
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));
+ 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->failed;
if (node_old) {
if (!(route_old->flags & DEVADDR_EXTERNAL) && route_old->enabled && !keep)
system_del_route(dev, route_old);
- put_source_table(route_old);
free(route_old);
}
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;
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;
+ }
}
addr.preferred_until = prefix->preferred_until;
addr.valid_until = prefix->valid_until;
+ if (addr.mask < 64) {
+ addr.mask = 64;
+ system_del_address(l3_downlink, &addr);
+ addr.mask = assignment->length;
+ }
+
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);
+
+ system_del_address(l3_downlink, &addr); // Work around dangling prefix routes
+
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)) {
+ if (addr.mask < 64)
+ addr.mask = 64;
+
+ interface_handle_subnet_route(iface, &addr, false);
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)) {
+ interface_handle_subnet_route(iface, &addr, false);
+
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 (addr.mask < 64)
+ addr.mask = 64;
+
+ interface_handle_subnet_route(iface, &addr, true);
+
if (uplink && uplink->l3_dev.dev) {
int mtu = system_update_ipv6_mtu(
uplink->l3_dev.dev, 0);
if (mtu > 0)
system_update_ipv6_mtu(l3_downlink, mtu);
}
+
assignment->enabled = true;
}
}
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;
}
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;
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) {
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);
if (!(route->flags & DEVROUTE_METRIC))
route->metric = ip->iface->metric;
- system_add_route(dev, route);
+ if (system_add_route(dev, route))
+ route->failed = true;
} else
system_del_route(dev, route);
route->enabled = _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