fall through in error case to clear congestion

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

diff --git a/src/ubus.c b/src/ubus.c
index 47239fd..0b51183 100644 (file)
--- 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 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,
 
 
 static int handle_dhcpv4_leases(struct ubus_context *ctx, _unused struct ubus_object *obj,


@@ -176,7 +177,7 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
 
 static void handle_dump(_unused struct ubus_request *req, _unused int type, struct blob_attr *msg)
 {
 
 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])
        blobmsg_parse(dump_attrs, DUMP_ATTR_MAX, tb, blob_data(msg), blob_len(msg));
 
        if (!tb[DUMP_ATTR_INTERFACE])


@@ -188,6 +189,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)
 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)


@@ -208,18 +222,11 @@ static int handle_update(_unused struct ubus_context *ctx, _unused struct ubus_o
        if (iface && iface->ignore)
                return 0;
 
        if (iface && iface->ignore)
                return 0;
 

-       ubus_invoke(ubus, objid, "dump", NULL, handle_dump, NULL, 0);
+       update_netifd(false);

        return 0;
 }
 
 
        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 *a;
 void ubus_apply_network(void)
 {
        struct blob_attr *a;


@@ -241,8 +248,8 @@ void ubus_apply_network(void)
                                blobmsg_get_string(tb[IFACE_ATTR_IFNAME]) : "";
 
                bool matched = false;
                                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);
                        char *f = memmem(c->upstream, c->upstream_len,
                                        interface, strlen(interface) + 1);
                        bool cmatched = !strcmp(interface, c->name) || !strcmp(ifname, c->ifname);


@@ -288,7 +295,7 @@ static void handle_event(_unused struct ubus_context *ctx, _unused struct ubus_e
                return;
 
        objid = blobmsg_get_u32(tb[OBJ_ATTR_ID]);
                return;
 
        objid = blobmsg_get_u32(tb[OBJ_ATTR_ID]);

-       subscribe_netifd();
+       update_netifd(true);

 }
 
 static struct ubus_event_handler event_handler = { .cb = handle_event };
 }
 
 static struct ubus_event_handler event_handler = { .cb = handle_event };


@@ -353,68 +360,6 @@ bool ubus_has_prefix(const char *name, const char *ifname)
 }
 
 
 }
 
 

-enum {
-       ADDR_ATTR_ADDR,
-       ADDR_ATTR_CLASS,
-       ADDR_ATTR_MAX
-};
-
-static const struct blobmsg_policy addr_attrs[ADDR_ATTR_MAX] = {
-       [ADDR_ATTR_ADDR] = { .name = "address", .type = BLOBMSG_TYPE_STRING },
-       [ADDR_ATTR_CLASS] = { .name = "class", .type = BLOBMSG_TYPE_STRING },
-};
-
-bool ubus_get_class(const char *ifname, const struct in6_addr *addr, uint16_t *pclass)
-{
-       struct blob_attr *c, *cur;
-       unsigned rem;
-
-       if (!dump)
-               return false;
-
-       blobmsg_for_each_attr(c, dump, rem) {
-               struct blob_attr *tb[IFACE_ATTR_MAX];
-               blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, blobmsg_data(c), blobmsg_data_len(c));
-
-               if (!tb[IFACE_ATTR_IFNAME])
-                       continue;
-
-               if (strcmp(ifname, blobmsg_get_string(tb[IFACE_ATTR_IFNAME])))
-                       continue;
-
-               if ((cur = tb[IFACE_ATTR_ADDRESS])) {
-                       if (blobmsg_type(cur) != BLOBMSG_TYPE_ARRAY || !blobmsg_check_attr(cur, NULL))
-                               continue;
-
-                       struct blob_attr *d;
-                       unsigned drem;
-                       blobmsg_for_each_attr(d, cur, drem) {
-                               struct blob_attr *t[ADDR_ATTR_MAX];
-                               blobmsg_parse(addr_attrs, ADDR_ATTR_MAX, t, blobmsg_data(d), blobmsg_data_len(d));
-
-                               if (!t[ADDR_ATTR_ADDR] || !t[ADDR_ATTR_CLASS])
-                                       continue;
-
-                               const char *addrs = blobmsg_get_string(t[ADDR_ATTR_ADDR]);
-                               const char *class = blobmsg_get_string(t[ADDR_ATTR_CLASS]);
-
-                               struct in6_addr ip6addr;
-                               inet_pton(AF_INET6, addrs, &ip6addr);
-
-                               if (IN6_ARE_ADDR_EQUAL(&ip6addr, addr)) {
-                                       *pclass = atoi(class);
-                                       return true;
-                               }
-                       }
-               }
-
-               return false;
-       }
-
-       return false;
-}
-
-

 int init_ubus(void)
 {
        if (!(ubus = ubus_connect(NULL))) {
 int init_ubus(void)
 {
        if (!(ubus = ubus_connect(NULL))) {


@@ -429,7 +374,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))
        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;
 }
 
        return 0;
 }