X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=proto.c;h=d5e99bf3b5298878a23eb77efa5604f42b79ab7b;hp=1d277c9de3d6ecc0de804817a09fb3dd7f2a3779;hb=2674941b06c1ec67f1aff1bff9212e1372106641;hpb=f00c15327f25cc68177d0e13f732c2fec54bf1c2

diff --git a/proto.c b/proto.c
index 1d277c9..d5e99bf 100644
--- a/proto.c
+++ b/proto.c
@@ -15,6 +15,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <limits.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 },
 };
 
-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,
@@ -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])) {
-			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;
 
 		}
 
@@ -251,7 +254,14 @@ 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);
+
+	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;
 }
@@ -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 *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)
@@ -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 (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;
-	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,
-			excludedp, excl_length);
+			excludedp, excl_length, pclass);
 	return true;
 }