dhcpv6-ia: update valid_until only for non static DHCPv6 leases

[project/odhcpd.git] / src / ubus.c

diff --git a/src/ubus.c b/src/ubus.c
index 2b6b1c7..e9e2de3 100644 (file)
--- 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);
                }
@@ -163,7 +165,6 @@ enum {
        IFACE_ATTR_DATA,
        IFACE_ATTR_PREFIX,
        IFACE_ATTR_ADDRESS,
-       IFACE_ATTR_ADDRESS4,
        IFACE_ATTR_MAX,
 };
 
@@ -174,18 +175,6 @@ static const struct blobmsg_policy iface_attrs[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 },
-};
-
-enum {
-       ADDR_ATTR_ADDRESS,
-       ADDR_ATTR_MASK,
-       ADDR_ATTR_MAX,
-};
-
-static const struct blobmsg_policy addr_attrs[ADDR_ATTR_MAX] = {
-       [ADDR_ATTR_ADDRESS] = { .name = "address", .type = BLOBMSG_TYPE_ARRAY },
-       [ADDR_ATTR_MASK] = { .name = "mask", .type = BLOBMSG_TYPE_INT32 },
 };
 
 static void handle_dump(_unused struct ubus_request *req, _unused int type, struct blob_attr *msg)
@@ -358,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;
@@ -372,75 +361,6 @@ bool ubus_has_prefix(const char *name, const char *ifname)
        return false;
 }
 
-struct in_addr* ubus_get_address4(const char *name)
-{
-       struct blob_attr *c, *cur;
-       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 ((cur = tb[IFACE_ATTR_ADDRESS4])) {
-                       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 *addr[ADDR_ATTR_MAX];
-                               blobmsg_parse(addr_attrs, ADDR_ATTR_MAX, addr, blobmsg_data(d), blobmsg_data_len(d));
-                               struct in_addr *addr4;
-                               if (inet_pton(AF_INET, blobmsg_get_string(addr[ADDR_ATTR_ADDRESS]), &addr4) == 1)
-                                       return addr4;
-                       }
-               }
-       }
-
-       return NULL;
-}
-
-struct in_addr* ubus_get_mask4(const char *name)
-{
-       struct blob_attr *c, *cur;
-       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 ((cur = tb[IFACE_ATTR_ADDRESS4])) {
-                       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 *addr[ADDR_ATTR_MAX];
-                               blobmsg_parse(addr_attrs, ADDR_ATTR_MAX, addr, blobmsg_data(d), blobmsg_data_len(d));
-                               struct in_addr *addr4;
-                               if (inet_pton(AF_INET, blobmsg_get_string(addr[ADDR_ATTR_MASK]), &addr4) == 1)
-                                       return addr4;
-                       }
-               }
-       }
-
-       return NULL;
-}
 
 int init_ubus(void)
 {