X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fubus.c;h=30f7e935fd2bf6c52331f5ecc26fa46fdaf5e96e;hp=dd478a946a3745607f7226a01823ce7726733384;hb=5683dd25da56c66e0a5c86e770b8ee2188ad569c;hpb=6f448c01f3c998d5761e1539764dde7979c82286 diff --git a/src/ubus.c b/src/ubus.c index dd478a9..30f7e93 100644 --- a/src/ubus.c +++ b/src/ubus.c @@ -1,55 +1,66 @@ #include #include #include +#include #include #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 blob_attr *dump = NULL; 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) { - blob_buf_init(&b, 0); - void *a = blobmsg_open_table(&b, "device"); + struct interface *iface; 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) { - if (iface->dhcpv4 != RELAYD_SERVER) + if (iface->dhcpv4 != RELAYD_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 *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; - void *l = blobmsg_open_table(&b, NULL); - + void *m, *l = blobmsg_open_table(&b, NULL); 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(&b, "hostname", lease->hostname); + blobmsg_add_string(&b, "hostname", (c->hostname) ? c->hostname : ""); + + m = blobmsg_open_array(&b, "flags"); + if (c->flags & OAF_BOUND) + blobmsg_add_string(&b, NULL, "bound"); + + if (c->flags & OAF_STATIC) + 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(lease->addr)}; + struct in_addr addr = {htonl(c->addr)}; 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); } @@ -60,61 +71,79 @@ 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); + 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, NULL, 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) { - blob_buf_init(&b, 0); - void *a = blobmsg_open_table(&b, "device"); + struct interface *iface; 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) { - if (iface->dhcpv6 != RELAYD_SERVER) + if (iface->dhcpv6 != RELAYD_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 *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); - 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_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_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_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); } @@ -161,20 +190,22 @@ enum { IFACE_ATTR_UP, IFACE_ATTR_DATA, IFACE_ATTR_PREFIX, + IFACE_ATTR_ADDRESS, IFACE_ATTR_MAX, }; static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = { [IFACE_ATTR_INTERFACE] = { .name = "interface", .type = BLOBMSG_TYPE_STRING }, - [IFACE_ATTR_IFNAME] = { .name = "ifname", .type = BLOBMSG_TYPE_STRING }, + [IFACE_ATTR_IFNAME] = { .name = "l3_device", .type = BLOBMSG_TYPE_STRING }, [IFACE_ATTR_UP] = { .name = "up", .type = BLOBMSG_TYPE_BOOL }, [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 }, }; static void handle_dump(_unused struct ubus_request *req, _unused int type, struct blob_attr *msg) { - struct blob_attr *tb[DUMP_ATTR_INTERFACE]; + struct blob_attr *tb[DUMP_ATTR_MAX]; blobmsg_parse(dump_attrs, DUMP_ATTR_MAX, tb, blob_data(msg), blob_len(msg)); if (!tb[DUMP_ATTR_INTERFACE]) @@ -182,7 +213,20 @@ static void handle_dump(_unused struct ubus_request *req, _unused int type, stru free(dump); dump = blob_memdup(tb[DUMP_ATTR_INTERFACE]); - raise(SIGHUP); + odhcpd_reload(); +} + + +static void update_netifd(bool subscribe) +{ + if (subscribe) + ubus_subscribe(ubus, &netifd, objid); + + ubus_abort_request(ubus, &req_dump); + if (!ubus_invoke_async(ubus, objid, "dump", NULL, &req_dump)) { + req_dump.data_cb = handle_dump; + ubus_complete_request_async(ubus, &req_dump); + } } @@ -191,7 +235,7 @@ 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, blobmsg_data(msg), blobmsg_data_len(msg)); + 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]) : ""; @@ -206,30 +250,22 @@ static int handle_update(_unused struct ubus_context *ctx, _unused struct ubus_o if (iface && iface->ignore) return 0; - ubus_invoke(ubus, objid, "dump", NULL, handle_dump, NULL, 0); + update_netifd(false); return 0; } -static void subscribe_netifd(void) -{ - netifd.cb = handle_update; - ubus_subscribe(ubus, &netifd, objid); - ubus_invoke(ubus, objid, "dump", NULL, handle_dump, NULL, 0); -} - - void ubus_apply_network(void) { - struct blob_attr *c; + struct blob_attr *a; unsigned rem; if (!dump) return; - blobmsg_for_each_attr(c, dump, rem) { + blobmsg_for_each_attr(a, dump, rem) { struct blob_attr *tb[IFACE_ATTR_MAX]; - blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, blobmsg_data(c), blobmsg_data_len(c)); + blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, blobmsg_data(a), blobmsg_data_len(a)); if (!tb[IFACE_ATTR_INTERFACE] || !tb[IFACE_ATTR_DATA]) continue; @@ -239,17 +275,25 @@ void ubus_apply_network(void) const char *ifname = (tb[IFACE_ATTR_IFNAME]) ? blobmsg_get_string(tb[IFACE_ATTR_IFNAME]) : ""; - struct interface *c; - list_for_each_entry(c, &interfaces, head) { + bool matched = false; + struct interface *c, *n; + list_for_each_entry_safe(c, n, &interfaces, head) { char *f = memmem(c->upstream, c->upstream_len, interface, strlen(interface) + 1); - if (strcmp(interface, c->name) && strcmp(ifname, c->ifname) && - (!f || (f != c->upstream && f[-1] != 0))) + bool cmatched = !strcmp(interface, c->name) || !strcmp(ifname, c->ifname); + matched |= cmatched; + + if (!cmatched && (!c->upstream_len || !f || (f != c->upstream && f[-1] != 0))) continue; - if (!c || !c->ignore) - config_parse_interface(tb[IFACE_ATTR_DATA], interface, false); + if (!c->ignore) + config_parse_interface(blobmsg_data(tb[IFACE_ATTR_DATA]), + blobmsg_data_len(tb[IFACE_ATTR_DATA]), c->name, false); } + + if (!matched) + config_parse_interface(blobmsg_data(tb[IFACE_ATTR_DATA]), + blobmsg_data_len(tb[IFACE_ATTR_DATA]), interface, false); } } @@ -271,7 +315,6 @@ static void handle_event(_unused struct ubus_context *ctx, _unused struct ubus_e { struct blob_attr *tb[OBJ_ATTR_MAX]; blobmsg_parse(obj_attrs, OBJ_ATTR_MAX, tb, blob_data(msg), blob_len(msg)); - objid = 0; if (!tb[OBJ_ATTR_ID] || !tb[OBJ_ATTR_PATH]) return; @@ -280,7 +323,7 @@ static void handle_event(_unused struct ubus_context *ctx, _unused struct ubus_e return; objid = blobmsg_get_u32(tb[OBJ_ATTR_ID]); - subscribe_netifd(); + update_netifd(true); } static struct ubus_event_handler event_handler = { .cb = handle_event }; @@ -296,7 +339,7 @@ const char* ubus_get_ifname(const char *name) blobmsg_for_each_attr(c, dump, rem) { struct blob_attr *tb[IFACE_ATTR_MAX]; - blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, blob_data(c), blob_len(c)); + 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]))) @@ -320,17 +363,17 @@ bool ubus_has_prefix(const char *name, const char *ifname) blobmsg_for_each_attr(c, dump, rem) { struct blob_attr *tb[IFACE_ATTR_MAX]; - blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, blob_data(c), blob_len(c)); + blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, blobmsg_data(c), blobmsg_data_len(c)); if (!tb[IFACE_ATTR_INTERFACE] || !tb[IFACE_ATTR_IFNAME]) continue; - if (!strcmp(name, blobmsg_get_string(tb[IFACE_ATTR_INTERFACE])) || - !strcmp(ifname, blobmsg_get_string(tb[IFACE_ATTR_IFNAME]))) + if (strcmp(name, blobmsg_get_string(tb[IFACE_ATTR_INTERFACE])) || + strcmp(ifname, blobmsg_get_string(tb[IFACE_ATTR_IFNAME]))) 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; @@ -352,11 +395,14 @@ int init_ubus(void) return -1; } + netifd.cb = handle_update; + ubus_register_subscriber(ubus, &netifd); + ubus_add_uloop(ubus); ubus_add_object(ubus, &main_object); ubus_register_event_handler(ubus, &event_handler, "ubus.object.add"); if (!ubus_lookup_id(ubus, "network.interface", &objid)) - subscribe_netifd(); + update_netifd(true); return 0; }