#include <string.h>
#include <stdlib.h>
#include <stdio.h>
+#include <limits.h>
#include <arpa/inet.h>
#include <netinet/in.h>
[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,
ADDR_PREFERRED,
ADDR_VALID,
ADDR_OFFLINK,
+ ADDR_CLASS,
__ADDR_MAX
};
[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 },
};
static struct device_addr *
} 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;
}
else if (addr->preferred_until > addr->valid_until)
goto error;
}
+
+ if ((cur = tb[ADDR_CLASS]))
+ addr->pclass = strdup(blobmsg_get_string(cur));
}
return addr;
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), excl_length = 0;
if (length < 1 || length > 64)
return false;
excludedp = &excluded;
+ } else if (!strcmp(key, "class")) {
+ pclass = val;
}
}
- 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;
}