ubus: fix invalid ipv6-prefix json

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

diff --git a/src/ubus.c b/src/ubus.c
index 19b14be..973ae5a 100644 (file)
--- a/src/ubus.c
+++ b/src/ubus.c
@@ -55,7 +55,7 @@ static int handle_dhcpv4_leases(struct ubus_context *ctx, _unused struct ubus_ob
                                blobmsg_add_string(&b, NULL, "static");
                        blobmsg_close_array(&b, m);
 
                                blobmsg_add_string(&b, NULL, "static");
                        blobmsg_close_array(&b, m);
 

-                       buf = blobmsg_alloc_string_buffer(&b, "ip", INET_ADDRSTRLEN);
+                       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);
                        struct in_addr addr = {.s_addr = c->addr};
                        inet_ntop(AF_INET, &addr, buf, INET_ADDRSTRLEN);
                        blobmsg_add_string_buffer(&b);


@@ -80,7 +80,7 @@ static void dhcpv6_blobmsg_ia_addr(struct in6_addr *addr, int prefix, uint32_t p
                                        uint32_t valid, _unused void *arg)
 {
        void *a = blobmsg_open_table(&b, NULL);
                                        uint32_t valid, _unused void *arg)
 {
        void *a = blobmsg_open_table(&b, NULL);

-       char *buf = blobmsg_alloc_string_buffer(&b, NULL, INET6_ADDRSTRLEN);
+       char *buf = blobmsg_alloc_string_buffer(&b, "address", INET6_ADDRSTRLEN);

 
        inet_ntop(AF_INET6, addr, buf, INET6_ADDRSTRLEN);
        blobmsg_add_string_buffer(&b);
 
        inet_ntop(AF_INET6, addr, buf, INET6_ADDRSTRLEN);
        blobmsg_add_string_buffer(&b);


@@ -412,7 +412,7 @@ bool ubus_has_prefix(const char *name, const char *ifname)
 int ubus_init(void)
 {
        if (!(ubus = ubus_connect(NULL))) {
 int ubus_init(void)
 {
        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;
        }