projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
IPv6: fix prefix assignment with continuous hints
[project/netifd.git]
/
proto.c
diff --git
a/proto.c
b/proto.c
index
634d31b
..
d5e99bf
100644
(file)
--- a/
proto.c
+++ b/
proto.c
@@
-15,6
+15,7
@@
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
+#include <limits.h>
#include <arpa/inet.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <netinet/in.h>
@@
-48,13
+49,13
@@
static const struct blobmsg_policy proto_ip_attributes[__OPT_MAX] = {
[OPT_IP6PREFIX] = { .name = "ip6prefix", .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_IP6PREFIX] = { .type = BLOBMSG_TYPE_STRING },
};
[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,
.n_params = __OPT_MAX,
.params = proto_ip_attributes,
.info = proto_ip_attr_info,
@@
-187,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])) {
} 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])) {
}
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;
}
}
@@
-251,6
+254,13
@@
parse_gateway_option(struct interface *iface, struct blob_attr *attr, bool v6)
route->mask = 0;
route->flags = (v6 ? DEVADDR_INET6 : DEVADDR_INET4);
route->mask = 0;
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;
vlist_add(&iface->proto_ip.route, &route->node, route);
return true;
@@
-274,10
+284,11
@@
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 *prefstr = strtok_r(NULL, ",", &saveptr);
char *validstr = (!prefstr) ? NULL : strtok_r(NULL, ",", &saveptr);
- char *excludestr = (!validstr) ? 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), excl_length = 0;
if (length < 1 || length > 64)
uint8_t length = strtoul(lengthstr, NULL, 10), excl_length = 0;
if (length < 1 || length > 64)
@@
-287,32
+298,45
@@
parse_prefix_option(struct interface *iface, const char *str, size_t len)
if (inet_pton(AF_INET6, addrstr, &addr) < 1)
return false;
if (inet_pton(AF_INET6, addrstr, &addr) < 1)
return false;
- if (excludestr) {
- char *sep = strchr(excludestr, '/');
- if (!sep)
- 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;
- *sep = 0;
- excl_length = atoi(sep + 1);
+ if (!strcmp(key, "excluded")) {
+ char *sep = strchr(val, '/');
+ if (!sep)
+ return false;
- if (inet_pton(AF_INET6, excludestr, &excluded) < 1)
- 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;
+ }
- excludedp = &excluded;
}
}
- time_t now = system_get_rtime();
+
+
+
+ int64_t now = system_get_rtime();
time_t preferred_until = 0;
time_t preferred_until = 0;
- if (prefstr && pref != 0xffffffff
U
)
+ if (prefstr && pref != 0xffffffff
LL && pref + now <= LONG_MAX
)
preferred_until = pref + now;
time_t valid_until = 0;
preferred_until = pref + now;
time_t valid_until = 0;
- if (validstr && valid != 0xffffffff
U
)
+ if (validstr && valid != 0xffffffff
LL && valid + now <= LONG_MAX
)
valid_until = valid + now;
interface_ip_add_device_prefix(iface, &addr, length,
valid_until, preferred_until,
valid_until = valid + now;
interface_ip_add_device_prefix(iface, &addr, length,
valid_until, preferred_until,
- excludedp, excl_length);
+ excludedp, excl_length
, pclass
);
return true;
}
return true;
}