treewide: align function naming

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

diff --git a/src/ubus.c b/src/ubus.c
index 5786318..95eeff7 100644 (file)
--- a/src/ubus.c
+++ b/src/ubus.c
@@ -27,7 +27,7 @@ static int handle_dhcpv4_leases(struct ubus_context *ctx, _unused struct ubus_ob
        a = blobmsg_open_table(&b, "device");
 
        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);
@@ -45,6 +45,7 @@ static int handle_dhcpv4_leases(struct ubus_context *ctx, _unused struct ubus_ob
                        blobmsg_add_string_buffer(&b);
 
                        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)
@@ -55,7 +56,7 @@ static int handle_dhcpv4_leases(struct ubus_context *ctx, _unused struct ubus_ob
                        blobmsg_close_array(&b, m);
 
                        buf = blobmsg_alloc_string_buffer(&b, "ip", INET_ADDRSTRLEN);
-                       struct in_addr addr = {htonl(c->addr)};
+                       struct in_addr addr = {.s_addr = c->addr};
                        inet_ntop(AF_INET, &addr, buf, INET_ADDRSTRLEN);
                        blobmsg_add_string_buffer(&b);
 
@@ -106,7 +107,7 @@ static int handle_dhcpv6_leases(_unused struct ubus_context *ctx, _unused struct
        a = blobmsg_open_table(&b, "device");
 
        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);
@@ -117,7 +118,7 @@ static int handle_dhcpv6_leases(_unused struct ubus_context *ctx, _unused struct
 
                list_for_each_entry(a, &iface->ia_assignments, head) {
                        if (a == border || (!INFINITE_VALID(a->valid_until) &&
-                                       a->valid_until < now))
+                                               a->valid_until < now))
                                continue;
 
                        void *m, *l = blobmsg_open_table(&b, NULL);
@@ -128,6 +129,7 @@ static int handle_dhcpv6_leases(_unused struct ubus_context *ctx, _unused struct
 
                        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");
@@ -388,7 +390,7 @@ bool ubus_has_prefix(const char *name, const char *ifname)
 }
 
 
-int init_ubus(void)
+int ubus_init(void)
 {
        if (!(ubus = ubus_connect(NULL))) {
                syslog(LOG_ERR, "Unable to connect to ubus: %s", strerror(errno));