X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fubus.c;h=e9e2de386e53e170c076b4b413a34c03b2c7ef62;hp=1c74499dc404cf1454a694a457adfa8ffde5585b;hb=091d8a94a6b7325309c3354344b96ff37aed52e2;hpb=0bce3a7e90ddfde046792248684b298530224dcd diff --git a/src/ubus.c b/src/ubus.c index 1c74499..e9e2de3 100644 --- a/src/ubus.c +++ b/src/ubus.c @@ -13,6 +13,7 @@ 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, @@ -33,7 +34,7 @@ static int handle_dhcpv4_leases(struct ubus_context *ctx, _unused struct ubus_ob struct dhcpv4_assignment *lease; list_for_each_entry(lease, &iface->dhcpv4_assignments, head) { - if (lease->valid_until < now) + if (!INFINITE_VALID(lease->valid_until) && lease->valid_until < now) continue; void *l = blobmsg_open_table(&b, NULL); @@ -49,7 +50,8 @@ static int handle_dhcpv4_leases(struct ubus_context *ctx, _unused struct ubus_ob 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(lease->valid_until) ? + (uint32_t)-1 : (uint32_t)(lease->valid_until - now)); blobmsg_close_table(&b, l); } @@ -82,7 +84,7 @@ static int handle_dhcpv6_leases(_unused struct ubus_context *ctx, _unused struct struct dhcpv6_assignment *lease; list_for_each_entry(lease, &iface->ia_assignments, head) { - if (lease->valid_until < now) + if (!INFINITE_VALID(lease->valid_until) && lease->valid_until < now) continue; void *l = blobmsg_open_table(&b, NULL); @@ -114,7 +116,8 @@ static int handle_dhcpv6_leases(_unused struct ubus_context *ctx, _unused struct } blobmsg_close_table(&b, m); - blobmsg_add_u32(&b, "valid", now - lease->valid_until); + blobmsg_add_u32(&b, "valid", INFINITE_VALID(lease->valid_until) ? + (uint32_t)-1 : (uint32_t)(lease->valid_until - now)); blobmsg_close_table(&b, l); } @@ -161,6 +164,7 @@ enum { IFACE_ATTR_UP, IFACE_ATTR_DATA, IFACE_ATTR_PREFIX, + IFACE_ATTR_ADDRESS, IFACE_ATTR_MAX, }; @@ -170,11 +174,12 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = { [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]) @@ -186,6 +191,19 @@ static void handle_dump(_unused struct ubus_request *req, _unused int type, stru } +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); + } +} + + static int handle_update(_unused struct ubus_context *ctx, _unused struct ubus_object *obj, _unused struct ubus_request_data *req, _unused const char *method, struct blob_attr *msg) @@ -206,29 +224,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) -{ - 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,14 +250,14 @@ void ubus_apply_network(void) blobmsg_get_string(tb[IFACE_ATTR_IFNAME]) : ""; bool matched = false; - struct interface *c; - list_for_each_entry(c, &interfaces, head) { + 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); bool cmatched = !strcmp(interface, c->name) || !strcmp(ifname, c->ifname); matched |= cmatched; - if (!cmatched && (!f || (f != c->upstream && f[-1] != 0))) + if (!cmatched && (!c->upstream_len || !f || (f != c->upstream && f[-1] != 0))) continue; if (!c->ignore) @@ -286,7 +297,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 }; @@ -331,12 +342,12 @@ bool ubus_has_prefix(const char *name, const char *ifname) 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; @@ -365,7 +376,7 @@ int init_ubus(void) 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; }