+/*
+ * 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
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
+#include <limits.h>
#include <arpa/inet.h>
#include <netinet/in.h>
#include "netifd.h"
+#include "system.h"
#include "interface.h"
#include "interface-ip.h"
#include "proto.h"
OPT_BROADCAST,
OPT_GATEWAY,
OPT_IP6GW,
- OPT_DNS,
- OPT_DNS_SEARCH,
+ OPT_IP6PREFIX,
__OPT_MAX,
};
[OPT_BROADCAST] = { .name = "broadcast", .type = BLOBMSG_TYPE_STRING },
[OPT_GATEWAY] = { .name = "gateway", .type = BLOBMSG_TYPE_STRING },
[OPT_IP6GW] = { .name = "ip6gw", .type = BLOBMSG_TYPE_STRING },
- [OPT_DNS] = { .name = "dns", .type = BLOBMSG_TYPE_ARRAY },
- [OPT_DNS_SEARCH] = { .name = "dns_search", .type = BLOBMSG_TYPE_ARRAY },
+ [OPT_IP6PREFIX] = { .name = "ip6prefix", .type = BLOBMSG_TYPE_ARRAY },
};
-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_DNS] = { .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,
};
+enum {
+ ADDR_IPADDR,
+ ADDR_MASK,
+ ADDR_BROADCAST,
+ ADDR_PTP,
+ ADDR_PREFERRED,
+ ADDR_VALID,
+ ADDR_OFFLINK,
+ ADDR_CLASS,
+ __ADDR_MAX
+};
-unsigned int
-parse_netmask_string(const char *str, bool v6)
-{
- struct in_addr addr;
- unsigned int ret;
- char *err = NULL;
-
- if (!strchr(str, '.')) {
- ret = strtoul(str, &err, 0);
- if (err && *err)
- goto error;
-
- return ret;
- }
-
- if (v6)
- goto error;
+static const struct blobmsg_policy proto_ip_addr[__ADDR_MAX] = {
+ [ADDR_IPADDR] = { .name = "ipaddr", .type = BLOBMSG_TYPE_STRING },
+ [ADDR_MASK] = { .name = "mask", .type = BLOBMSG_TYPE_STRING },
+ [ADDR_BROADCAST] = { .name = "broadcast", .type = BLOBMSG_TYPE_STRING },
+ [ADDR_PTP] = { .name = "ptp", .type = BLOBMSG_TYPE_STRING },
+ [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 },
+};
- if (inet_aton(str, &addr) != 1)
- goto error;
+static struct device_addr *
+alloc_device_addr(bool v6, bool ext)
+{
+ struct device_addr *addr;
- return 32 - fls(~(ntohl(addr.s_addr)));
+ addr = calloc(1, sizeof(*addr));
+ addr->flags = v6 ? DEVADDR_INET6 : DEVADDR_INET4;
+ if (ext)
+ addr->flags |= DEVADDR_EXTERNAL;
-error:
- return ~0;
+ return addr;
}
static bool
-split_netmask(char *str, unsigned int *netmask, bool v6)
+parse_addr(struct interface *iface, const char *str, bool v6, int mask,
+ bool ext, uint32_t broadcast)
{
- char *delim = strchr(str, '/');
+ struct device_addr *addr;
+ int af = v6 ? AF_INET6 : AF_INET;
- if (delim) {
- *(delim++) = 0;
+ addr = alloc_device_addr(v6, ext);
+ if (!addr)
+ return false;
- *netmask = parse_netmask_string(delim, v6);
+ addr->mask = mask;
+ if (!parse_ip_and_netmask(af, str, &addr->addr, &addr->mask)) {
+ interface_add_error(iface, "proto", "INVALID_ADDRESS", &str, 1);
+ free(addr);
+ return false;
}
+
+ if (broadcast)
+ addr->broadcast = broadcast;
+
+ vlist_add(&iface->proto_ip.addr, &addr->node, &addr->flags);
return true;
}
static int
-parse_ip_and_netmask(int af, const char *str, void *addr, unsigned int *netmask)
+parse_static_address_option(struct interface *iface, struct blob_attr *attr,
+ bool v6, int netmask, bool ext, uint32_t broadcast)
{
- char *astr = alloca(strlen(str) + 1);
+ struct blob_attr *cur;
+ int n_addr = 0;
+ int rem;
- strcpy(astr, str);
- if (!split_netmask(astr, netmask, af == AF_INET6))
- return 0;
+ blobmsg_for_each_attr(cur, attr, rem) {
+ if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING)
+ return -1;
- if (af == AF_INET6) {
- if (*netmask > 128)
- return 0;
- } else {
- if (*netmask > 32)
- return 0;
+ n_addr++;
+ if (!parse_addr(iface, blobmsg_data(cur), v6, netmask, ext,
+ broadcast))
+ return -1;
}
- return inet_pton(af, astr, addr);
+ return n_addr;
}
static struct device_addr *
-proto_parse_ip_addr_string(const char *str, bool v6, int mask)
+parse_address_item(struct blob_attr *attr, bool v6, bool ext)
{
struct device_addr *addr;
- int af = v6 ? AF_INET6 : AF_INET;
+ struct blob_attr *tb[__ADDR_MAX];
+ struct blob_attr *cur;
- addr = calloc(1, sizeof(*addr));
- addr->flags = v6 ? DEVADDR_INET6 : DEVADDR_INET4;
- addr->mask = mask;
- if (!parse_ip_and_netmask(af, str, &addr->addr, &addr->mask)) {
- free(addr);
+ if (blobmsg_type(attr) != BLOBMSG_TYPE_TABLE)
return NULL;
- }
- return addr;
-}
-static bool
-parse_addr(struct interface *iface, const char *str, bool v6, int mask,
- bool ext, uint32_t broadcast)
-{
- struct device_addr *addr;
+ addr = alloc_device_addr(v6, ext);
+ if (!addr)
+ return NULL;
- addr = proto_parse_ip_addr_string(str, v6, mask);
- if (!addr) {
- interface_add_error(iface, "proto", "INVALID_ADDRESS", &str, 1);
- return false;
+ blobmsg_parse(proto_ip_addr, __ADDR_MAX, tb, blobmsg_data(attr), blobmsg_data_len(attr));
+
+ addr->mask = v6 ? 128 : 32;
+ if ((cur = tb[ADDR_MASK])) {
+ unsigned int new_mask;
+
+ new_mask = parse_netmask_string(blobmsg_data(cur), v6);
+ if (new_mask > addr->mask)
+ goto error;
+
+ addr->mask = new_mask;
}
- if (broadcast)
- addr->broadcast = broadcast;
+ cur = tb[ADDR_IPADDR];
+ if (!cur)
+ goto error;
- if (ext)
- addr->flags |= DEVADDR_EXTERNAL;
+ if (!inet_pton(v6 ? AF_INET6 : AF_INET, blobmsg_data(cur), &addr->addr))
+ goto error;
- vlist_add(&iface->proto_ip.addr, &addr->node, &addr->mask);
- return true;
+ if ((cur = tb[ADDR_OFFLINK]) && blobmsg_get_bool(cur))
+ addr->flags |= DEVADDR_OFFLINK;
+
+ if (!v6) {
+ if ((cur = tb[ADDR_BROADCAST]) &&
+ !inet_pton(AF_INET, blobmsg_data(cur), &addr->broadcast))
+ goto error;
+ if ((cur = tb[ADDR_PTP]) &&
+ !inet_pton(AF_INET, blobmsg_data(cur), &addr->point_to_point))
+ goto error;
+ } else {
+ time_t now = system_get_rtime();
+ if ((cur = tb[ADDR_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])) {
+ 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;
+
+ }
+
+ if (addr->valid_until) {
+ if (!addr->preferred_until)
+ addr->preferred_until = addr->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;
+
+error:
+ free(addr);
+ return NULL;
}
static int
-parse_address_option(struct interface *iface, struct blob_attr *attr, bool v6,
- int netmask, bool ext, uint32_t broadcast)
+parse_address_list(struct interface *iface, struct blob_attr *attr, bool v6,
+ bool ext)
{
+ struct device_addr *addr;
struct blob_attr *cur;
int n_addr = 0;
int rem;
blobmsg_for_each_attr(cur, attr, rem) {
- if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING)
+ addr = parse_address_item(cur, v6, ext);
+ if (!addr)
return -1;
n_addr++;
- if (!parse_addr(iface, blobmsg_data(cur), v6, netmask, ext,
- broadcast))
- return -1;
+ vlist_add(&iface->proto_ip.addr, &addr->node, &addr->flags);
}
return n_addr;
}
-
static bool
parse_gateway_option(struct interface *iface, struct blob_attr *attr, bool v6)
{
}
route->mask = 0;
- route->flags = DEVADDR_DEVICE | (v6 ? DEVADDR_INET6 : DEVADDR_INET4);
- vlist_add(&iface->proto_ip.route, &route->node, &route->mask);
+ route->flags = (v6 ? DEVADDR_INET6 : DEVADDR_INET4);
+ unsigned int table = (v6) ? iface->ip6table : iface->ip4table;
+ if (table) {
+ route->table = table;
+ route->flags |= DEVROUTE_SRCTABLE;
+ }
+
+ vlist_add(&iface->proto_ip.route, &route->node, route);
+
+ return true;
+}
+
+static bool
+parse_prefix_option(struct interface *iface, const char *str, size_t len)
+{
+ char buf[128] = {0}, *saveptr;
+ if (len > sizeof(buf))
+ return false;
+
+ memcpy(buf, str, len);
+ char *addrstr = strtok_r(buf, "/", &saveptr);
+ if (!addrstr)
+ return false;
+
+ char *lengthstr = strtok_r(NULL, ",", &saveptr);
+ if (!lengthstr)
+ return false;
+
+ 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;
+
+ 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), excl_length = 0;
+ if (length < 1 || length > 64)
+ return false;
+
+ struct in6_addr addr, excluded, *excludedp = NULL;
+ if (inet_pton(AF_INET6, addrstr, &addr) < 1)
+ return false;
+
+ 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 != 0xffffffffLL && pref + now <= LONG_MAX)
+ preferred_until = pref + now;
+
+ time_t valid_until = 0;
+ if (validstr && valid != 0xffffffffLL && valid + now <= LONG_MAX)
+ valid_until = valid + now;
+
+ interface_ip_add_device_prefix(iface, &addr, length,
+ valid_until, preferred_until,
+ excludedp, excl_length, pclass);
return true;
}
+static int
+parse_prefix_list(struct interface *iface, struct blob_attr *attr)
+{
+ struct blob_attr *cur;
+ int n_addr = 0;
+ int rem;
+
+ blobmsg_for_each_attr(cur, attr, rem) {
+ if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING)
+ return -1;
+
+ n_addr++;
+ if (!parse_prefix_option(iface, blobmsg_data(cur),
+ blobmsg_data_len(cur)))
+ return -1;
+ }
+
+ return n_addr;
+}
+
int
-proto_apply_ip_settings(struct interface *iface, struct blob_attr *attr, bool ext)
+proto_apply_static_ip_settings(struct interface *iface, struct blob_attr *attr)
{
struct blob_attr *tb[__OPT_MAX];
struct blob_attr *cur;
}
if ((cur = tb[OPT_IPADDR]))
- n_v4 = parse_address_option(iface, cur, false,
- netmask, ext, bcast.s_addr);
+ n_v4 = parse_static_address_option(iface, cur, false,
+ netmask, false, bcast.s_addr);
if ((cur = tb[OPT_IP6ADDR]))
- n_v6 = parse_address_option(iface, cur, true,
- netmask, ext, 0);
+ n_v6 = parse_static_address_option(iface, cur, true,
+ 128, false, 0);
- if (!n_v4 && !n_v6) {
- error = "NO_ADDRESS";
- goto error;
- }
+ if ((cur = tb[OPT_IP6PREFIX]))
+ if (parse_prefix_list(iface, cur) < 0)
+ goto out;
if (n_v4 < 0 || n_v6 < 0)
goto out;
goto out;
}
- if ((cur = tb[OPT_DNS]))
- interface_add_dns_server_list(&iface->proto_ip, cur);
-
- if ((cur = tb[OPT_DNS_SEARCH]))
- interface_add_dns_search_list(&iface->proto_ip, cur);
-
return 0;
error:
return -1;
}
+int
+proto_apply_ip_settings(struct interface *iface, struct blob_attr *attr, bool ext)
+{
+ struct blob_attr *tb[__OPT_MAX];
+ struct blob_attr *cur;
+ int n_v4 = 0, n_v6 = 0;
+
+ blobmsg_parse(proto_ip_attributes, __OPT_MAX, tb, blob_data(attr), blob_len(attr));
+
+ if ((cur = tb[OPT_IPADDR]))
+ n_v4 = parse_address_list(iface, cur, false, ext);
+
+ if ((cur = tb[OPT_IP6ADDR]))
+ n_v6 = parse_address_list(iface, cur, true, ext);
+
+ if ((cur = tb[OPT_IP6PREFIX]))
+ if (parse_prefix_list(iface, cur) < 0)
+ goto out;
+
+ if (n_v4 < 0 || n_v6 < 0)
+ goto out;
+
+ if ((cur = tb[OPT_GATEWAY])) {
+ if (n_v4 && !parse_gateway_option(iface, cur, false))
+ goto out;
+ }
+
+ if ((cur = tb[OPT_IP6GW])) {
+ if (n_v6 && !parse_gateway_option(iface, cur, true))
+ goto out;
+ }
+
+ return 0;
+
+out:
+ return -1;
+}
+
void add_proto_handler(struct proto_handler *p)
{
if (!handlers.comp)
}
void
+proto_dump_handlers(struct blob_buf *b)
+{
+ struct proto_handler *p;
+ void *c;
+
+ avl_for_each_element(&handlers, p, avl) {
+ c = blobmsg_open_table(b, p->name);
+ blobmsg_add_u8(b, "no_device", !!(p->flags & PROTO_FLAG_NODEV));
+ blobmsg_close_table(b, c);
+ }
+}
+
+void
proto_init_interface(struct interface *iface, struct blob_attr *attr)
{
const struct proto_handler *proto = iface->proto_handler;
projects / project / netifd.git / blobdiff