struct dhcpv4_assignment *lease;
list_for_each_entry(lease, &iface->dhcpv4_assignments, head) {
- if (lease->valid_until < now)
+ if (!INFINITE_VALID(lease->valid_until) && lease->valid_until < now)
continue;
void *l = blobmsg_open_table(&b, NULL);
inet_ntop(AF_INET, &addr, buf, INET_ADDRSTRLEN);
blobmsg_add_string_buffer(&b);
- blobmsg_add_u32(&b, "valid", now - lease->valid_until);
+ blobmsg_add_u32(&b, "valid", INFINITE_VALID(lease->valid_until) ?
+ (uint32_t)-1 : (uint32_t)(lease->valid_until - now));
blobmsg_close_table(&b, l);
}
struct dhcpv6_assignment *lease;
list_for_each_entry(lease, &iface->ia_assignments, head) {
- if (lease->valid_until < now)
+ if (!INFINITE_VALID(lease->valid_until) && lease->valid_until < now)
continue;
void *l = blobmsg_open_table(&b, NULL);
}
blobmsg_close_table(&b, m);
- blobmsg_add_u32(&b, "valid", now - lease->valid_until);
+ blobmsg_add_u32(&b, "valid", INFINITE_VALID(lease->valid_until) ?
+ (uint32_t)-1 : (uint32_t)(lease->valid_until - now));
blobmsg_close_table(&b, l);
}
IFACE_ATTR_DATA,
IFACE_ATTR_PREFIX,
IFACE_ATTR_ADDRESS,
- IFACE_ATTR_ADDRESS4,
IFACE_ATTR_MAX,
};
[IFACE_ATTR_DATA] = { .name = "data", .type = BLOBMSG_TYPE_TABLE },
[IFACE_ATTR_PREFIX] = { .name = "ipv6-prefix", .type = BLOBMSG_TYPE_ARRAY },
[IFACE_ATTR_ADDRESS] = { .name = "ipv6-address", .type = BLOBMSG_TYPE_ARRAY },
- [IFACE_ATTR_ADDRESS4] = { .name = "ipv4-address", .type = BLOBMSG_TYPE_ARRAY },
};
static void handle_dump(_unused struct ubus_request *req, _unused int type, struct blob_attr *msg)
continue;
if ((cur = tb[IFACE_ATTR_PREFIX])) {
- if (blobmsg_type(cur) != BLOBMSG_TYPE_ARRAY || !blobmsg_check_attr(cur, NULL))
+ if (blobmsg_type(cur) != BLOBMSG_TYPE_ARRAY || !blobmsg_check_attr(cur, false))
continue;
struct blob_attr *d;
return false;
}
-struct in_addr ubus_get_address4(const char *name)
-{
- struct blob_attr *c;
- unsigned rem;
-
- if (!dump)
- return NULL;
-
- blobmsg_for_each_attr(c, dump, rem) {
- struct blob_attr *tb[IFACE_ATTR_MAX];
- blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, blobmsg_data(c), blobmsg_data_len(c));
-
- if (!tb[IFACE_ATTR_INTERFACE] || strcmp(name,
- blobmsg_get_string(tb[IFACE_ATTR_INTERFACE])))
- continue;
-
- if (tb[IFACE_ATTR_IFNAME]) {
- struct in_addr addr4;
- if (inet_pton(AF_INET, blobmsg_get_string(tb[IFACE_ATTR_ADDRESS4]), &addr4) == 1)
- return addr4;
- }
- }
-
- return NULL;
-}
-
-struct in_addr ubus_get_mask4(const char *name)
-{
- struct blob_attr *c;
- unsigned rem;
-
- if (!dump)
- return NULL;
-
- blobmsg_for_each_attr(c, dump, rem) {
- struct blob_attr *tb[IFACE_ATTR_MAX];
- blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, blobmsg_data(c), blobmsg_data_len(c));
-
- if (!tb[IFACE_ATTR_INTERFACE] || strcmp(name,
- blobmsg_get_string(tb[IFACE_ATTR_INTERFACE])))
- continue;
-
- if (tb[IFACE_ATTR_IFNAME]) {
- struct in_addr mask4;
- if (inet_pton(AF_INET, blobmsg_get_string(tb[IFACE_ATTR_MASK4]), &mask4) == 1)
- return mask4;
- }
- }
-
- return NULL;
-}
int init_ubus(void)
{