ubus: fix invalid ipv6-prefix json

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

diff --git a/src/ubus.c b/src/ubus.c
index 7e956fa..973ae5a 100644 (file)
--- a/src/ubus.c
+++ b/src/ubus.c
@@ -1,13 +1,13 @@
 #include <syslog.h>
 #include <libubus.h>
 #include <libubox/uloop.h>
 #include <syslog.h>
 #include <libubus.h>
 #include <libubox/uloop.h>

+#include <netinet/in.h>

 #include <arpa/inet.h>
 
 #include "odhcpd.h"
 #include "dhcpv6.h"
 #include "dhcpv4.h"
 
 #include <arpa/inet.h>
 
 #include "odhcpd.h"
 #include "dhcpv6.h"
 #include "dhcpv4.h"
 

-

 static struct ubus_context *ubus = NULL;
 static struct ubus_subscriber netifd;
 static struct blob_buf b;
 static struct ubus_context *ubus = NULL;
 static struct ubus_subscriber netifd;
 static struct blob_buf b;


@@ -15,42 +15,53 @@ static struct blob_attr *dump = NULL;
 static uint32_t objid = 0;
 static struct ubus_request req_dump = { .list = LIST_HEAD_INIT(req_dump.list) };
 
 static uint32_t objid = 0;
 static struct ubus_request req_dump = { .list = LIST_HEAD_INIT(req_dump.list) };
 

-

 static int handle_dhcpv4_leases(struct ubus_context *ctx, _unused struct ubus_object *obj,
                struct ubus_request_data *req, _unused const char *method,
                _unused struct blob_attr *msg)
 {
 static int handle_dhcpv4_leases(struct ubus_context *ctx, _unused struct ubus_object *obj,
                struct ubus_request_data *req, _unused const char *method,
                _unused struct blob_attr *msg)
 {

-       blob_buf_init(&b, 0);
-       void *a = blobmsg_open_table(&b, "device");
+       struct interface *iface;

        time_t now = odhcpd_time();
        time_t now = odhcpd_time();

+       void *a;
+
+       blob_buf_init(&b, 0);
+       a = blobmsg_open_table(&b, "device");

 
 

-       struct interface *iface;

        list_for_each_entry(iface, &interfaces, head) {
        list_for_each_entry(iface, &interfaces, head) {

-               if (iface->dhcpv4 != RELAYD_SERVER)
+               if (iface->dhcpv4 != MODE_SERVER || iface->dhcpv4_assignments.next == NULL)

                        continue;
 
                void *i = blobmsg_open_table(&b, iface->ifname);
                void *j = blobmsg_open_array(&b, "leases");
 
                        continue;
 
                void *i = blobmsg_open_table(&b, iface->ifname);
                void *j = blobmsg_open_array(&b, "leases");
 

-               struct dhcpv4_assignment *lease;
-               list_for_each_entry(lease, &iface->dhcpv4_assignments, head) {
-                       if (lease->valid_until < now)
+               struct dhcpv4_assignment *c;
+               list_for_each_entry(c, &iface->dhcpv4_assignments, head) {
+                       if (!INFINITE_VALID(c->valid_until) && c->valid_until < now)

                                continue;
 
                                continue;
 

-                       void *l = blobmsg_open_table(&b, NULL);
-
+                       void *m, *l = blobmsg_open_table(&b, NULL);

                        char *buf = blobmsg_alloc_string_buffer(&b, "mac", 13);
                        char *buf = blobmsg_alloc_string_buffer(&b, "mac", 13);

-                       odhcpd_hexlify(buf, lease->hwaddr, sizeof(lease->hwaddr));
+
+                       odhcpd_hexlify(buf, c->hwaddr, sizeof(c->hwaddr));

                        blobmsg_add_string_buffer(&b);
 
                        blobmsg_add_string_buffer(&b);
 

-                       blobmsg_add_string(&b, "hostname", lease->hostname);
+                       blobmsg_add_string(&b, "hostname", (c->hostname) ? c->hostname : "");
+                       blobmsg_add_u8(&b, "accept-reconf-nonce", c->accept_fr_nonce);
+
+                       m = blobmsg_open_array(&b, "flags");
+                       if (c->flags & OAF_BOUND)
+                               blobmsg_add_string(&b, NULL, "bound");

 
 

-                       buf = blobmsg_alloc_string_buffer(&b, "ip", INET_ADDRSTRLEN);
-                       struct in_addr addr = {htonl(lease->addr)};
+                       if (c->flags & OAF_STATIC)
+                               blobmsg_add_string(&b, NULL, "static");
+                       blobmsg_close_array(&b, m);
+
+                       buf = blobmsg_alloc_string_buffer(&b, "address", INET_ADDRSTRLEN);
+                       struct in_addr addr = {.s_addr = c->addr};

                        inet_ntop(AF_INET, &addr, buf, INET_ADDRSTRLEN);
                        blobmsg_add_string_buffer(&b);
 
                        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(c->valid_until) ?
+                                               (uint32_t)-1 : (uint32_t)(c->valid_until - now));

 
                        blobmsg_close_table(&b, l);
                }
 
                        blobmsg_close_table(&b, l);
                }


@@ -61,61 +72,80 @@ static int handle_dhcpv4_leases(struct ubus_context *ctx, _unused struct ubus_ob
 
        blobmsg_close_table(&b, a);
        ubus_send_reply(ctx, req, b.head);
 
        blobmsg_close_table(&b, a);
        ubus_send_reply(ctx, req, b.head);

+

        return 0;
 }
 
        return 0;
 }
 

+static void dhcpv6_blobmsg_ia_addr(struct in6_addr *addr, int prefix, uint32_t pref,
+                                       uint32_t valid, _unused void *arg)
+{
+       void *a = blobmsg_open_table(&b, NULL);
+       char *buf = blobmsg_alloc_string_buffer(&b, "address", INET6_ADDRSTRLEN);
+
+       inet_ntop(AF_INET6, addr, buf, INET6_ADDRSTRLEN);
+       blobmsg_add_string_buffer(&b);
+       blobmsg_add_u32(&b, "preferred-lifetime",
+                       pref == UINT32_MAX ? (uint32_t)-1 : pref);
+       blobmsg_add_u32(&b, "valid-lifetime",
+                       valid == UINT32_MAX ? (uint32_t)-1 : valid);
+
+       if (prefix != 128)
+               blobmsg_add_u32(&b, "prefix-length", prefix);
+
+       blobmsg_close_table(&b, a);
+}

 
 static int handle_dhcpv6_leases(_unused struct ubus_context *ctx, _unused struct ubus_object *obj,
                _unused struct ubus_request_data *req, _unused const char *method,
                _unused struct blob_attr *msg)
 {
 
 static int handle_dhcpv6_leases(_unused struct ubus_context *ctx, _unused struct ubus_object *obj,
                _unused struct ubus_request_data *req, _unused const char *method,
                _unused struct blob_attr *msg)
 {

-       blob_buf_init(&b, 0);
-       void *a = blobmsg_open_table(&b, "device");
+       struct interface *iface;

        time_t now = odhcpd_time();
        time_t now = odhcpd_time();

+       void *a;
+
+       blob_buf_init(&b, 0);
+       a = blobmsg_open_table(&b, "device");

 
 

-       struct interface *iface;

        list_for_each_entry(iface, &interfaces, head) {
        list_for_each_entry(iface, &interfaces, head) {

-               if (iface->dhcpv6 != RELAYD_SERVER)
+               if (iface->dhcpv6 != MODE_SERVER || iface->ia_assignments.next == NULL)

                        continue;
 
                void *i = blobmsg_open_table(&b, iface->ifname);
                void *j = blobmsg_open_array(&b, "leases");
 
                        continue;
 
                void *i = blobmsg_open_table(&b, iface->ifname);
                void *j = blobmsg_open_array(&b, "leases");
 

-               struct dhcpv6_assignment *lease;
-               list_for_each_entry(lease, &iface->ia_assignments, head) {
-                       if (lease->valid_until < now)
-                               continue;
+               struct dhcpv6_assignment *a, *border = list_last_entry(
+                               &iface->ia_assignments, struct dhcpv6_assignment, head);

 
 

-                       void *l = blobmsg_open_table(&b, NULL);
+               list_for_each_entry(a, &iface->ia_assignments, head) {
+                       if (a == border || (!INFINITE_VALID(a->valid_until) &&
+                                               a->valid_until < now))
+                               continue;

 
 

+                       void *m, *l = blobmsg_open_table(&b, NULL);

                        char *buf = blobmsg_alloc_string_buffer(&b, "duid", 264);
                        char *buf = blobmsg_alloc_string_buffer(&b, "duid", 264);

-                       odhcpd_hexlify(buf, lease->clid_data, lease->clid_len);
+
+                       odhcpd_hexlify(buf, a->clid_data, a->clid_len);

                        blobmsg_add_string_buffer(&b);
 
                        blobmsg_add_string_buffer(&b);
 

-                       blobmsg_add_u32(&b, "iaid", ntohl(lease->iaid));
-                       blobmsg_add_string(&b, "hostname", (lease->hostname) ? lease->hostname : "");
-                       blobmsg_add_u32(&b, "assigned", lease->assigned);
-                       blobmsg_add_u32(&b, "length", lease->length);
-
-                       void *m = blobmsg_open_array(&b, "ipv6");
-                       struct in6_addr addr;
-                       for (size_t i = 0; i < iface->ia_addr_len; ++i) {
-                               if (iface->ia_addr[i].prefix > 64)
-                                       continue;
-
-                               addr = iface->ia_addr[i].addr;
-                               if (lease->length == 128)
-                                       addr.s6_addr32[3] = htonl(lease->assigned);
-                               else
-                                       addr.s6_addr32[1] |= htonl(lease->assigned);
-
-                               char *c = blobmsg_alloc_string_buffer(&b, NULL, INET6_ADDRSTRLEN);
-                               inet_ntop(AF_INET6, &addr, c, INET6_ADDRSTRLEN);
-                               blobmsg_add_string_buffer(&b);
-                       }
+                       blobmsg_add_u32(&b, "iaid", ntohl(a->iaid));
+                       blobmsg_add_string(&b, "hostname", (a->hostname) ? a->hostname : "");
+                       blobmsg_add_u8(&b, "accept-reconf", a->accept_reconf);
+                       blobmsg_add_u32(&b, "assigned", a->assigned);
+
+                       m = blobmsg_open_array(&b, "flags");
+                       if (a->flags & OAF_BOUND)
+                               blobmsg_add_string(&b, NULL, "bound");
+
+                       if (a->flags & OAF_STATIC)
+                               blobmsg_add_string(&b, NULL, "static");
+                       blobmsg_close_array(&b, m);
+
+                       m = blobmsg_open_array(&b, a->length == 128 ? "ipv6-addr": "ipv6-prefix");
+                       dhcpv6_enum_ia_addrs(iface, a, now, dhcpv6_blobmsg_ia_addr, NULL);

                        blobmsg_close_table(&b, m);
 
                        blobmsg_close_table(&b, m);
 

-                       blobmsg_add_u32(&b, "valid", now - lease->valid_until);
+                       blobmsg_add_u32(&b, "valid", INFINITE_VALID(a->valid_until) ?
+                                               (uint32_t)-1 : (uint32_t)(a->valid_until - now));

 
                        blobmsg_close_table(&b, l);
                }
 
                        blobmsg_close_table(&b, l);
                }


@@ -163,7 +193,6 @@ enum {
        IFACE_ATTR_DATA,
        IFACE_ATTR_PREFIX,
        IFACE_ATTR_ADDRESS,
        IFACE_ATTR_DATA,
        IFACE_ATTR_PREFIX,
        IFACE_ATTR_ADDRESS,

-       IFACE_ATTR_ADDRESS4,

        IFACE_ATTR_MAX,
 };
 
        IFACE_ATTR_MAX,
 };
 


@@ -174,7 +203,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_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)
 };
 
 static void handle_dump(_unused struct ubus_request *req, _unused int type, struct blob_attr *msg)


@@ -283,6 +311,25 @@ static const struct blobmsg_policy obj_attrs[OBJ_ATTR_MAX] = {
        [OBJ_ATTR_PATH] = { .name = "path", .type = BLOBMSG_TYPE_STRING },
 };
 
        [OBJ_ATTR_PATH] = { .name = "path", .type = BLOBMSG_TYPE_STRING },
 };
 

+void ubus_bcast_dhcp_event(const char *type, const uint8_t *mac,
+               const size_t mlen, const struct in_addr *addr, const char *name,
+               const char *interface)
+{
+       if (!ubus || !main_object.has_subscribers)
+               return;
+
+       blob_buf_init(&b, 0);
+       if (mac)
+               blobmsg_add_string(&b, "mac", odhcpd_print_mac(mac, mlen));
+       if (addr)
+               blobmsg_add_string(&b, "ip", inet_ntoa(*addr));
+       if (name)
+               blobmsg_add_string(&b, "name", name);
+       if (interface)
+               blobmsg_add_string(&b, "interface", interface);
+
+       ubus_notify(ubus, &main_object, type, b.head, -1);
+}

 
 static void handle_event(_unused struct ubus_context *ctx, _unused struct ubus_event_handler *ev,
                 _unused const char *type, struct blob_attr *msg)
 
 static void handle_event(_unused struct ubus_context *ctx, _unused struct ubus_event_handler *ev,
                 _unused const char *type, struct blob_attr *msg)


@@ -347,7 +394,7 @@ bool ubus_has_prefix(const char *name, const char *ifname)
                        continue;
 
                if ((cur = tb[IFACE_ATTR_PREFIX])) {
                        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;
                                continue;
 
                        struct blob_attr *d;


@@ -361,62 +408,11 @@ bool ubus_has_prefix(const char *name, const char *ifname)
        return false;
 }
 
        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)
+int ubus_init(void)

 {
        if (!(ubus = ubus_connect(NULL))) {
 {
        if (!(ubus = ubus_connect(NULL))) {

-               syslog(LOG_ERR, "Unable to connect to ubus: %s", strerror(errno));
+               syslog(LOG_ERR, "Unable to connect to ubus: %m");

                return -1;
        }
 
                return -1;
        }