X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=src%2Fubus.c;h=b2e48cf184ca69cdd1e5be5f42fb5d29b224672e;hb=6d23385242c918b0e00f5e21ed41dd655905752b;hp=6fbb98ff8fddb91418c2f72af0ca01138d376c55;hpb=028ab85da8ef40af43aeb48129ffa32c98503336;p=project%2Fodhcpd.git diff --git a/src/ubus.c b/src/ubus.c index 6fbb98f..b2e48cf 100644 --- a/src/ubus.c +++ b/src/ubus.c @@ -4,6 +4,8 @@ #include #include +#include + #include "odhcpd.h" #include "dhcpv6.h" #include "dhcpv4.h" @@ -26,14 +28,14 @@ static int handle_dhcpv4_leases(struct ubus_context *ctx, _unused struct ubus_ob blob_buf_init(&b, 0); a = blobmsg_open_table(&b, "device"); - list_for_each_entry(iface, &interfaces, head) { + avl_for_each_element(&interfaces, iface, avl) { 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"); - struct dhcpv4_assignment *c; + struct dhcp_assignment *c; list_for_each_entry(c, &iface->dhcpv4_assignments, head) { if (!INFINITE_VALID(c->valid_until) && c->valid_until < now) continue; @@ -53,9 +55,12 @@ static int handle_dhcpv4_leases(struct ubus_context *ctx, _unused struct ubus_ob if (c->flags & OAF_STATIC) blobmsg_add_string(&b, NULL, "static"); + + if (c->flags & OAF_BROKEN_HOSTNAME) + blobmsg_add_string(&b, NULL, "broken-hostname"); 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); @@ -80,7 +85,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); - 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); @@ -106,15 +111,15 @@ static int handle_dhcpv6_leases(_unused struct ubus_context *ctx, _unused struct blob_buf_init(&b, 0); a = blobmsg_open_table(&b, "device"); - list_for_each_entry(iface, &interfaces, head) { + avl_for_each_element(&interfaces, iface, avl) { 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"); - struct dhcpv6_assignment *a, *border = list_last_entry( - &iface->ia_assignments, struct dhcpv6_assignment, head); + struct dhcp_assignment *a, *border = list_last_entry( + &iface->ia_assignments, struct dhcp_assignment, head); list_for_each_entry(a, &iface->ia_assignments, head) { if (a == border || (!INFINITE_VALID(a->valid_until) && @@ -141,7 +146,7 @@ static int handle_dhcpv6_leases(_unused struct ubus_context *ctx, _unused struct 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); + dhcpv6_ia_enum_addrs(iface, a, now, dhcpv6_blobmsg_ia_addr, NULL); blobmsg_close_table(&b, m); blobmsg_add_u32(&b, "valid", INFINITE_VALID(a->valid_until) ? @@ -225,7 +230,9 @@ static void update_netifd(bool subscribe) ubus_subscribe(ubus, &netifd, objid); ubus_abort_request(ubus, &req_dump); - if (!ubus_invoke_async(ubus, objid, "dump", NULL, &req_dump)) { + blob_buf_init(&b, 0); + + if (!ubus_invoke_async(ubus, objid, "dump", b.head, &req_dump)) { req_dump.data_cb = handle_dump; ubus_complete_request_async(ubus, &req_dump); } @@ -237,22 +244,23 @@ static int handle_update(_unused struct ubus_context *ctx, _unused struct ubus_o struct blob_attr *msg) { struct blob_attr *tb[IFACE_ATTR_MAX]; - blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, blob_data(msg), blob_len(msg)); + struct interface *c; + bool update = true; + blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, blob_data(msg), blob_len(msg)); const char *interface = (tb[IFACE_ATTR_INTERFACE]) ? blobmsg_get_string(tb[IFACE_ATTR_INTERFACE]) : ""; - const char *ifname = (tb[IFACE_ATTR_IFNAME]) ? - blobmsg_get_string(tb[IFACE_ATTR_IFNAME]) : ""; - struct interface *c, *iface = NULL; - list_for_each_entry(c, &interfaces, head) - if (!strcmp(interface, c->name) || !strcmp(ifname, c->ifname)) - iface = c; + avl_for_each_element(&interfaces, c, avl) { + if (!strcmp(interface, c->name) && c->ignore) { + update = false; + break; + } + } - if (iface && iface->ignore) - return 0; + if (update) + update_netifd(false); - update_netifd(false); return 0; } @@ -274,15 +282,13 @@ void ubus_apply_network(void) const char *interface = (tb[IFACE_ATTR_INTERFACE]) ? blobmsg_get_string(tb[IFACE_ATTR_INTERFACE]) : ""; - const char *ifname = (tb[IFACE_ATTR_IFNAME]) ? - blobmsg_get_string(tb[IFACE_ATTR_IFNAME]) : ""; bool matched = false; - struct interface *c, *n; - list_for_each_entry_safe(c, n, &interfaces, head) { + struct interface *c, *tmp; + avl_for_each_element_safe(&interfaces, c, avl, tmp) { char *f = memmem(c->upstream, c->upstream_len, interface, strlen(interface) + 1); - bool cmatched = !strcmp(interface, c->name) || !strcmp(ifname, c->ifname); + bool cmatched = !strcmp(interface, c->name); matched |= cmatched; if (!cmatched && (!c->upstream_len || !f || (f != c->upstream && f[-1] != 0))) @@ -311,6 +317,25 @@ static const struct blobmsg_policy obj_attrs[OBJ_ATTR_MAX] = { [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) @@ -390,10 +415,10 @@ 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)); + syslog(LOG_ERR, "Unable to connect to ubus: %m"); return -1; }