/*
* 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 <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_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_IP6PREFIX] = { .name = "ip6prefix", .type = BLOBMSG_TYPE_ARRAY },
};
static const union config_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 = {
ADDR_MASK,
ADDR_BROADCAST,
ADDR_PTP,
+ ADDR_PREFERRED,
+ ADDR_VALID,
+ ADDR_OFFLINK,
__ADDR_MAX
};
[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 },
};
-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;
-
- if (inet_aton(str, &addr) != 1)
- goto error;
-
- return 32 - fls(~(ntohl(addr.s_addr)));
-
-error:
- return ~0;
-}
-
-static bool
-split_netmask(char *str, unsigned int *netmask, bool v6)
-{
- char *delim = strchr(str, '/');
-
- if (delim) {
- *(delim++) = 0;
-
- *netmask = parse_netmask_string(delim, v6);
- }
- return true;
-}
-
-static int
-parse_ip_and_netmask(int af, const char *str, void *addr, unsigned int *netmask)
-{
- char *astr = alloca(strlen(str) + 1);
-
- strcpy(astr, str);
- if (!split_netmask(astr, netmask, af == AF_INET6))
- return 0;
-
- if (af == AF_INET6) {
- if (*netmask > 128)
- return 0;
- } else {
- if (*netmask > 32)
- return 0;
- }
-
- return inet_pton(af, astr, addr);
-}
-
static struct device_addr *
alloc_device_addr(bool v6, bool ext)
{
if (!inet_pton(v6 ? AF_INET6 : AF_INET, blobmsg_data(cur), &addr->addr))
goto error;
+ 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))
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])) {
+ uint32_t preferred = blobmsg_get_u32(cur);
+ if (preferred < UINT32_MAX)
+ addr->preferred_until = now + preferred;
+ }
+
+ if ((cur = tb[ADDR_VALID])) {
+ uint32_t valid = blobmsg_get_u32(cur);
+ if (valid < UINT32_MAX)
+ addr->valid_until = now + valid;
+
+ }
+
+ if (addr->valid_until) {
+ if (!addr->preferred_until)
+ addr->preferred_until = addr->valid_until;
+ else if (addr->preferred_until > addr->valid_until)
+ goto error;
+ }
}
return addr;
route->mask = 0;
route->flags = (v6 ? DEVADDR_INET6 : DEVADDR_INET4);
- vlist_add(&iface->proto_ip.route, &route->node, &route->flags);
+ 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 *excludestr = (!validstr) ? NULL : strtok_r(NULL, ",", &saveptr);
+
+ uint32_t pref = (!prefstr) ? 0 : strtoul(prefstr, NULL, 10);
+ uint32_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;
+
+ if (excludestr) {
+ char *sep = strchr(excludestr, '/');
+ if (!sep)
+ return false;
+
+ *sep = 0;
+ excl_length = atoi(sep + 1);
+
+ if (inet_pton(AF_INET6, excludestr, &excluded) < 1)
+ return false;
+
+ excludedp = &excluded;
+ }
+
+ time_t now = system_get_rtime();
+ time_t preferred_until = 0;
+ if (prefstr && pref != 0xffffffffU)
+ preferred_until = pref + now;
+
+ time_t valid_until = 0;
+ if (validstr && valid != 0xffffffffU)
+ valid_until = valid + now;
+
+ interface_ip_add_device_prefix(iface, &addr, length,
+ valid_until, preferred_until,
+ excludedp, excl_length);
+ 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_static_ip_settings(struct interface *iface, struct blob_attr *attr)
{
if ((cur = tb[OPT_IP6ADDR]))
n_v6 = parse_static_address_option(iface, cur, true,
- netmask, false, 0);
+ 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;
{
struct blob_attr *tb[__OPT_MAX];
struct blob_attr *cur;
- const char *error;
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_IP6ADDR]))
n_v6 = parse_address_list(iface, cur, true, ext);
- 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;
return 0;
-error:
- interface_add_error(iface, "proto", error, NULL, 0);
out:
return -1;
}
projects / project / netifd.git / blobdiff