X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fubus.c;h=e9e2de386e53e170c076b4b413a34c03b2c7ef62;hp=9e7066303a503f195430d5d97d81ed89de6f35a5;hb=df023adafeee1bf48fa1e0cce31e7130f8043dae;hpb=c7a8e2380a5299d48a851717e139c0876e85483e

diff --git a/src/ubus.c b/src/ubus.c
index 9e70663..e9e2de3 100644
--- a/src/ubus.c
+++ b/src/ubus.c
@@ -34,7 +34,7 @@ static int handle_dhcpv4_leases(struct ubus_context *ctx, _unused struct ubus_ob
 
 		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);
@@ -50,7 +50,8 @@ static int handle_dhcpv4_leases(struct ubus_context *ctx, _unused struct ubus_ob
 			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);
 		}
@@ -83,7 +84,7 @@ static int handle_dhcpv6_leases(_unused struct ubus_context *ctx, _unused struct
 
 		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);
@@ -115,7 +116,8 @@ static int handle_dhcpv6_leases(_unused struct ubus_context *ctx, _unused struct
 			}
 			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);
 		}
@@ -177,7 +179,7 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
 
 static void handle_dump(_unused struct ubus_request *req, _unused int type, struct blob_attr *msg)
 {
-	struct blob_attr *tb[DUMP_ATTR_INTERFACE];
+	struct blob_attr *tb[DUMP_ATTR_MAX];
 	blobmsg_parse(dump_attrs, DUMP_ATTR_MAX, tb, blob_data(msg), blob_len(msg));
 
 	if (!tb[DUMP_ATTR_INTERFACE])
@@ -345,7 +347,7 @@ bool ubus_has_prefix(const char *name, const char *ifname)
 			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;
@@ -360,68 +362,6 @@ bool ubus_has_prefix(const char *name, const char *ifname)
 }
 
 
-enum {
-	ADDR_ATTR_ADDR,
-	ADDR_ATTR_CLASS,
-	ADDR_ATTR_MAX
-};
-
-static const struct blobmsg_policy addr_attrs[ADDR_ATTR_MAX] = {
-	[ADDR_ATTR_ADDR] = { .name = "address", .type = BLOBMSG_TYPE_STRING },
-	[ADDR_ATTR_CLASS] = { .name = "class", .type = BLOBMSG_TYPE_STRING },
-};
-
-bool ubus_get_class(const char *ifname, const struct in6_addr *addr, uint16_t *pclass)
-{
-	struct blob_attr *c, *cur;
-	unsigned rem;
-
-	if (!dump)
-		return false;
-
-	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_IFNAME])
-			continue;
-
-		if (strcmp(ifname, blobmsg_get_string(tb[IFACE_ATTR_IFNAME])))
-			continue;
-
-		if ((cur = tb[IFACE_ATTR_ADDRESS])) {
-			if (blobmsg_type(cur) != BLOBMSG_TYPE_ARRAY || !blobmsg_check_attr(cur, NULL))
-				continue;
-
-			struct blob_attr *d;
-			unsigned drem;
-			blobmsg_for_each_attr(d, cur, drem) {
-				struct blob_attr *t[ADDR_ATTR_MAX];
-				blobmsg_parse(addr_attrs, ADDR_ATTR_MAX, t, blobmsg_data(d), blobmsg_data_len(d));
-
-				if (!t[ADDR_ATTR_ADDR] || !t[ADDR_ATTR_CLASS])
-					continue;
-
-				const char *addrs = blobmsg_get_string(t[ADDR_ATTR_ADDR]);
-				const char *class = blobmsg_get_string(t[ADDR_ATTR_CLASS]);
-
-				struct in6_addr ip6addr;
-				inet_pton(AF_INET6, addrs, &ip6addr);
-
-				if (IN6_ARE_ADDR_EQUAL(&ip6addr, addr)) {
-					*pclass = atoi(class);
-					return true;
-				}
-			}
-		}
-
-		return false;
-	}
-
-	return false;
-}
-
-
 int init_ubus(void)
 {
 	if (!(ubus = ubus_connect(NULL))) {