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);
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)
blobmsg_add_string(&b, NULL, "static");
blobmsg_close_array(&b, m);
- buf = blobmsg_alloc_string_buffer(&b, "ip", INET_ADDRSTRLEN);
- struct in_addr addr = {htonl(c->addr)};
+ 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);
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);
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);
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);
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");
[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)
}
-int init_ubus(void)
+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;
}