Improve ubus support

* Use network.interface dump call instead of individual status calls
  to reduce overall netifd lookups and invokes to 1 per fw3 process.

* Allow protocol handlers to assign a firewall zone for an interface
  in the data section to allow for dynamic firewall zone assignment.

diff --git a/ubus.c b/ubus.c
index d5f52b9287f4ac71b049e675c91805b42d9d5da7..f8b0143d7fa8a5f8efa31a89da26f8769f7dadfc 100644 (file)
--- a/ubus.c
+++ b/ubus.c
@@ -18,24 +18,47 @@
 
 #include "ubus.h"
 
+static struct blob_attr *interfaces = NULL;
 
-static struct ubus_context *ctx = NULL;
+
+static void dump_cb(struct ubus_request *req, int type, struct blob_attr *msg)
+{
+       struct blob_attr *cur;
+       unsigned rem = blob_len(msg);
+       __blob_for_each_attr(cur, blob_data(msg), rem)
+               if (!strcmp(blobmsg_name(cur), "interface"))
+                       interfaces = blob_memdup(cur);
+}
 
 bool
 fw3_ubus_connect(void)
 {
-       ctx = ubus_connect(NULL);
-       return !!ctx;
+       bool status = false;
+       uint32_t id;
+       struct ubus_context *ctx = ubus_connect(NULL);
+
+       if (!ctx)
+               goto out;
+
+       if (ubus_lookup_id(ctx, "network.interface", &id))
+               goto out;
+
+       if (ubus_invoke(ctx, id, "dump", NULL, dump_cb, NULL, 500))
+               goto out;
+
+       status = true;
+
+out:
+       if (ctx)
+               ubus_free(ctx);
+       return status;
 }
 
 void
 fw3_ubus_disconnect(void)
 {
-       if (!ctx)
-               return;
-
-       ubus_free(ctx);
-       ctx = NULL;
+       free(interfaces);
+       interfaces = NULL;
 }
 
 static struct fw3_address *
@@ -83,90 +106,71 @@ parse_subnets(struct list_head *head, enum fw3_family family,
        }
 }
 
-struct dev_addr
-{
-       struct fw3_device *dev;
-       struct list_head *addr;
-};
-
-static void
-invoke_cb(struct ubus_request *req, int type, struct blob_attr *msg)
-{
-       int rem;
-       char *data;
-       struct blob_attr *cur;
-       struct dev_addr *da = (struct dev_addr *)req->priv;
-       struct fw3_device *dev = da->dev;
-
-       if (!msg)
-               return;
-
-       rem = blob_len(msg);
-       __blob_for_each_attr(cur, blob_data(msg), rem)
-       {
-               data = blobmsg_data(cur);
-
-               if (dev && !strcmp(blobmsg_name(cur), "device") && !dev->name[0])
-                       snprintf(dev->name, sizeof(dev->name), "%s", data);
-               else if (dev && !strcmp(blobmsg_name(cur), "l3_device"))
-                       snprintf(dev->name, sizeof(dev->name), "%s", data);
-               else if (!dev && !strcmp(blobmsg_name(cur), "ipv4-address"))
-                       parse_subnets(da->addr, FW3_FAMILY_V4,
-                                     blobmsg_data(cur), blobmsg_data_len(cur));
-               else if (!dev && (!strcmp(blobmsg_name(cur), "ipv6-address") ||
-                                 !strcmp(blobmsg_name(cur), "ipv6-prefix-assignment")))
-                       parse_subnets(da->addr, FW3_FAMILY_V6,
-                                     blobmsg_data(cur), blobmsg_data_len(cur));
-       }
-
-       if (dev)
-               dev->set = !!dev->name[0];
-}
-
 static void *
-invoke_common(const char *net, bool dev)
+invoke_common(const char *net, bool device)
 {
-       uint32_t id;
-       char path[128];
-       static struct dev_addr da;
+       struct fw3_device *dev = NULL;
+       struct list_head *addr = NULL;
+       struct blob_attr *c, *cur;
+       unsigned r, rem;
+       char *data;
+       bool matched;
 
-       if (!net)
+       if (!net || !interfaces)
                return NULL;
 
-       memset(&da, 0, sizeof(da));
-
-       if (dev)
-               da.dev = malloc(sizeof(*da.dev));
+       if (device)
+               dev = malloc(sizeof(*dev));
        else
-               da.addr = malloc(sizeof(*da.addr));
+               addr = malloc(sizeof(*addr));
 
-       if ((dev && !da.dev) || (!dev && !da.addr))
+       if ((device && !dev) || (!device && !addr))
                goto fail;
 
-       if (dev)
-               memset(da.dev, 0, sizeof(*da.dev));
+       if (device)
+               memset(dev, 0, sizeof(*dev));
        else
-               INIT_LIST_HEAD(da.addr);
-
-       snprintf(path, sizeof(path), "network.interface.%s", net);
-
-       if (ubus_lookup_id(ctx, path, &id))
-               goto fail;
-
-       if (ubus_invoke(ctx, id, "status", NULL, invoke_cb, &da, 500))
-               goto fail;
+               INIT_LIST_HEAD(addr);
+
+       blobmsg_for_each_attr(c, interfaces, r) {
+               matched = false;
+               blobmsg_for_each_attr(cur, c, rem)
+                       if (!strcmp(blobmsg_name(cur), "interface"))
+                               matched = !strcmp(blobmsg_get_string(cur), net);
+
+               if (!matched)
+                       continue;
+
+               blobmsg_for_each_attr(cur, c, rem) {
+                       data = blobmsg_data(cur);
+
+                       if (dev && !strcmp(blobmsg_name(cur), "device") && !dev->name[0])
+                               snprintf(dev->name, sizeof(dev->name), "%s", data);
+                       else if (dev && !strcmp(blobmsg_name(cur), "l3_device"))
+                               snprintf(dev->name, sizeof(dev->name), "%s", data);
+                       else if (!dev && !strcmp(blobmsg_name(cur), "ipv4-address"))
+                               parse_subnets(addr, FW3_FAMILY_V4,
+                                             blobmsg_data(cur), blobmsg_data_len(cur));
+                       else if (!dev && (!strcmp(blobmsg_name(cur), "ipv6-address") ||
+                                         !strcmp(blobmsg_name(cur), "ipv6-prefix-assignment")))
+                               parse_subnets(addr, FW3_FAMILY_V6,
+                                             blobmsg_data(cur), blobmsg_data_len(cur));
+               }
+
+               if (dev)
+                       dev->set = !!dev->name[0];
+
+               break;
+       }
 
-       if (dev && da.dev->set)
-               return da.dev;
-       else if (!dev && !list_empty(da.addr))
-               return da.addr;
+       if (device && dev->set)
+               return dev;
+       else if (!device && !list_empty(addr))
+               return addr;
 
 fail:
-       if (da.dev)
-               free(da.dev);
-
-       if (da.addr)
-               free(da.addr);
+       free(dev);
+       free(addr);
 
        return NULL;
 }
@@ -182,3 +186,29 @@ fw3_ubus_address(const char *net)
 {
        return invoke_common(net, false);
 }
+
+void
+fw3_ubus_zone_devices(struct fw3_zone *zone)
+{
+       struct blob_attr *c, *cur, *dcur;
+       unsigned r, rem, drem;
+       const char *name;
+       bool matches;
+
+       blobmsg_for_each_attr(c, interfaces, r) {
+               name = NULL;
+               matches = false;
+
+               blobmsg_for_each_attr(cur, c, rem) {
+                       if (!strcmp(blobmsg_name(cur), "interface"))
+                               name = blobmsg_get_string(cur);
+                       else if (!strcmp(blobmsg_name(cur), "data"))
+                               blobmsg_for_each_attr(dcur, cur, drem)
+                                       if (!strcmp(blobmsg_name(dcur), "zone"))
+                                               matches = !strcmp(blobmsg_get_string(dcur), zone->name);
+               }
+
+               if (name && matches)
+                       fw3_parse_device(&zone->networks, name, true);
+       }
+}

diff --git a/ubus.h b/ubus.h
index e16b873f7a6cb1155f904f55a17c8515f954830a..4c104812757d17f274403657b3166f263e94be93 100644 (file)
--- a/ubus.h
+++ b/ubus.h
@@ -32,4 +32,6 @@ struct fw3_device * fw3_ubus_device(const char *net);
 
 struct list_head * fw3_ubus_address(const char *net);
 
+void fw3_ubus_zone_devices(struct fw3_zone *zone);
+
 #endif

diff --git a/zones.c b/zones.c
index 8d8fd3d05d41c4b0badc032aa6d7c6daf6d35259..8225601897f1d3c8d788e4d74bd6d1f6b5d235a7 100644 (file)
--- a/zones.c
+++ b/zones.c
@@ -199,6 +199,8 @@ fw3_load_zones(struct fw3_state *state, struct uci_package *p)
                        continue;
                }
 
+               fw3_ubus_zone_devices(zone);
+
                if (list_empty(&zone->networks) && list_empty(&zone->devices) &&
                    list_empty(&zone->subnets) && !zone->extra_src)
                {