/*
* 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
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
+#include <limits.h>
#include <arpa/inet.h>
#include <netinet/in.h>
OPT_GATEWAY,
OPT_IP6GW,
OPT_IP6PREFIX,
- OPT_IP6ASSIGN,
__OPT_MAX,
};
[OPT_GATEWAY] = { .name = "gateway", .type = BLOBMSG_TYPE_STRING },
[OPT_IP6GW] = { .name = "ip6gw", .type = BLOBMSG_TYPE_STRING },
[OPT_IP6PREFIX] = { .name = "ip6prefix", .type = BLOBMSG_TYPE_ARRAY },
- [OPT_IP6ASSIGN] = { .name = "ip6assign", .type = BLOBMSG_TYPE_INT32 },
};
-static const union config_param_info proto_ip_attr_info[__OPT_MAX] = {
+static const struct uci_blob_param_info proto_ip_attr_info[__OPT_MAX] = {
[OPT_IPADDR] = { .type = BLOBMSG_TYPE_STRING },
[OPT_IP6ADDR] = { .type = BLOBMSG_TYPE_STRING },
[OPT_IP6PREFIX] = { .type = BLOBMSG_TYPE_STRING },
};
-const struct config_param_list proto_ip_attr = {
+const struct uci_blob_param_list proto_ip_attr = {
.n_params = __OPT_MAX,
.params = proto_ip_attributes,
.info = proto_ip_attr_info,
ADDR_PREFERRED,
ADDR_VALID,
ADDR_OFFLINK,
+ ADDR_CLASS,
__ADDR_MAX
};
[ADDR_PREFERRED] = { .name = "preferred", .type = BLOBMSG_TYPE_INT32 },
[ADDR_VALID] = { .name = "valid", .type = BLOBMSG_TYPE_INT32 },
[ADDR_OFFLINK] = { .name = "offlink", .type = BLOBMSG_TYPE_BOOL },
+ [ADDR_CLASS] = { .name = "class", .type = BLOBMSG_TYPE_STRING },
};
static struct device_addr *
} else {
time_t now = system_get_rtime();
if ((cur = tb[ADDR_PREFERRED])) {
- uint32_t preferred = blobmsg_get_u32(cur);
- if (preferred < UINT32_MAX)
- addr->preferred_until = now + preferred;
+ int64_t preferred = blobmsg_get_u32(cur);
+ int64_t preferred_until = preferred + (int64_t)now;
+ if (preferred_until <= LONG_MAX && preferred != 0xffffffffLL)
+ addr->preferred_until = preferred_until;
}
if ((cur = tb[ADDR_VALID])) {
- uint32_t valid = blobmsg_get_u32(cur);
- if (valid < UINT32_MAX)
- addr->valid_until = now + valid;
+ int64_t valid = blobmsg_get_u32(cur);
+ int64_t valid_until = valid + (int64_t)now;
+ if (valid_until <= LONG_MAX && valid != 0xffffffffLL)
+ addr->valid_until = valid_until;
}
else if (addr->preferred_until > addr->valid_until)
goto error;
}
+
+ if ((cur = tb[ADDR_CLASS]))
+ addr->pclass = strdup(blobmsg_get_string(cur));
}
return addr;
route->mask = 0;
route->flags = (v6 ? DEVADDR_INET6 : DEVADDR_INET4);
- vlist_add(&iface->proto_ip.route, &route->node, &route->flags);
-
- return true;
-}
-
-static bool
-parse_ip6assign_option(struct interface *iface, struct blob_attr *attr)
-{
- uint8_t oldval = iface->proto_ip.assignment_length;
- uint8_t newval = blobmsg_get_u32(attr);
- struct device_prefix *prefix;
- list_for_each_entry(prefix, &prefixes, head) {
- if (oldval && oldval != newval)
- interface_ip_set_prefix_assignment(prefix, iface, 0);
-
- if (newval && newval <= 64)
- interface_ip_set_prefix_assignment(prefix, iface, newval);
+ unsigned int table = (v6) ? iface->ip6table : iface->ip4table;
+ if (table) {
+ route->table = table;
+ route->flags |= DEVROUTE_SRCTABLE;
}
- iface->proto_ip.assignment_length = newval;
+ vlist_add(&iface->proto_ip.route, &route->node, route);
+
return true;
}
char *prefstr = strtok_r(NULL, ",", &saveptr);
char *validstr = (!prefstr) ? NULL : strtok_r(NULL, ",", &saveptr);
+ char *addstr = (!validstr) ? NULL : strtok_r(NULL, ",", &saveptr);
+ const char *pclass = NULL;
- uint32_t pref = (!prefstr) ? 0 : strtoul(prefstr, NULL, 10);
- uint32_t valid = (!validstr) ? 0 : strtoul(validstr, NULL, 10);
+ int64_t pref = (!prefstr) ? 0 : strtoul(prefstr, NULL, 10);
+ int64_t valid = (!validstr) ? 0 : strtoul(validstr, NULL, 10);
- uint8_t length = strtoul(lengthstr, NULL, 10);
+ uint8_t length = strtoul(lengthstr, NULL, 10), excl_length = 0;
if (length < 1 || length > 64)
return false;
- struct in6_addr addr;
+ struct in6_addr addr, excluded, *excludedp = NULL;
if (inet_pton(AF_INET6, addrstr, &addr) < 1)
return false;
- time_t now = system_get_rtime();
+ for (; addstr; addstr = strtok_r(NULL, ",", &saveptr)) {
+ char *key = NULL, *val = NULL, *addsaveptr;
+ if (!(key = strtok_r(addstr, "=", &addsaveptr)) ||
+ !(val = strtok_r(NULL, ",", &addsaveptr)))
+ continue;
+
+ if (!strcmp(key, "excluded")) {
+ char *sep = strchr(val, '/');
+ if (!sep)
+ return false;
+
+ *sep = 0;
+ excl_length = atoi(sep + 1);
+
+ if (inet_pton(AF_INET6, val, &excluded) < 1)
+ return false;
+
+ excludedp = &excluded;
+ } else if (!strcmp(key, "class")) {
+ pclass = val;
+ }
+
+ }
+
+
+
+
+ int64_t now = system_get_rtime();
time_t preferred_until = 0;
- if (prefstr && pref != 0xffffffffU)
+ if (prefstr && pref != 0xffffffffLL && pref + now <= LONG_MAX)
preferred_until = pref + now;
time_t valid_until = 0;
- if (validstr && valid != 0xffffffffU)
+ if (validstr && valid != 0xffffffffLL && valid + now <= LONG_MAX)
valid_until = valid + now;
interface_ip_add_device_prefix(iface, &addr, length,
- valid_until, preferred_until);
+ valid_until, preferred_until,
+ excludedp, excl_length, pclass);
return true;
}
goto out;
}
- if ((cur = tb[OPT_IP6ASSIGN]))
- if (!parse_ip6assign_option(iface, cur))
- goto out;
-
return 0;
error:
goto out;
}
- if ((cur = tb[OPT_IP6ASSIGN]))
- if (!parse_ip6assign_option(iface, cur))
- goto out;
-
return 0;
out:
void *c;
avl_for_each_element(&handlers, p, avl) {
+ void *v;
+
c = blobmsg_open_table(b, p->name);
+ if (p->config_params->validate) {
+ int i;
+
+ v = blobmsg_open_table(b, "validate");
+ for (i = 0; i < p->config_params->n_params; i++)
+ blobmsg_add_string(b, p->config_params->params[i].name, uci_get_validate_string(p->config_params, i));
+ blobmsg_close_table(b, v);
+ }
blobmsg_add_u8(b, "no_device", !!(p->flags & PROTO_FLAG_NODEV));
blobmsg_close_table(b, c);
}
projects / project / netifd.git / blobdiff