IPv6: fix prefix assignment with continuous hints
[project/netifd.git] / proto.c
diff --git a/proto.c b/proto.c
index d040be8..d5e99bf 100644 (file)
--- a/proto.c
+++ b/proto.c
@@ -1,6 +1,7 @@
 /*
  * 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
@@ -14,6 +15,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <limits.h>
 
 #include <arpa/inet.h>
 #include <netinet/in.h>
@@ -34,7 +36,6 @@ enum {
        OPT_GATEWAY,
        OPT_IP6GW,
        OPT_IP6PREFIX,
-       OPT_IP6ASSIGN,
        __OPT_MAX,
 };
 
@@ -46,16 +47,15 @@ static const struct blobmsg_policy proto_ip_attributes[__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,
@@ -188,15 +188,17 @@ parse_address_item(struct blob_attr *attr, bool v6, bool ext)
        } 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;
 
                }
 
@@ -252,27 +254,15 @@ parse_gateway_option(struct interface *iface, struct blob_attr *attr, bool v6)
 
        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;
 }
 
@@ -294,29 +284,59 @@ parse_prefix_option(struct interface *iface, const char *str, size_t len)
 
        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;
 }
 
@@ -373,7 +393,7 @@ 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 ((cur = tb[OPT_IP6PREFIX]))
                if (parse_prefix_list(iface, cur) < 0)
@@ -392,10 +412,6 @@ proto_apply_static_ip_settings(struct interface *iface, struct blob_attr *attr)
                        goto out;
        }
 
-       if ((cur = tb[OPT_IP6ASSIGN]))
-               if (!parse_ip6assign_option(iface, cur))
-                       goto out;
-
        return 0;
 
 error:
@@ -436,10 +452,6 @@ proto_apply_ip_settings(struct interface *iface, struct blob_attr *attr, bool ex
                        goto out;
        }
 
-       if ((cur = tb[OPT_IP6ASSIGN]))
-               if (!parse_ip6assign_option(iface, cur))
-                       goto out;
-
        return 0;
 
 out: