X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=ubus.c;h=a5f3a65a9d7c5b8ebe175ea32a77d481c9712abb;hb=92281eb747b56e748b7c3d754055919c23befdd4;hp=d5f52b9287f4ac71b049e675c91805b42d9d5da7;hpb=fad5b8a021c1cf9c9185bbbc1d16f54aaf867fff;p=project%2Ffirewall3.git

diff --git a/ubus.c b/ubus.c
index d5f52b9..a5f3a65 100644
--- a/ubus.c
+++ b/ubus.c
@@ -18,24 +18,48 @@
 
 #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)
+{
+	static const struct blobmsg_policy policy = { "interface", BLOBMSG_TYPE_ARRAY };
+	struct blob_attr *cur;
+
+	blobmsg_parse(&policy, 1, &cur, blob_data(msg), blob_len(msg));
+	if (cur)
+		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 *
@@ -44,13 +68,10 @@ parse_subnet(enum fw3_family family, struct blob_attr *dict, int rem)
 	struct blob_attr *cur;
 	struct fw3_address *addr;
 
-	addr = malloc(sizeof(*addr));
-
+	addr = calloc(1, sizeof(*addr));
 	if (!addr)
 		return NULL;
 
-	memset(addr, 0, sizeof(*addr));
-
 	addr->set = true;
 	addr->family = family;
 
@@ -69,12 +90,16 @@ parse_subnet(enum fw3_family family, struct blob_attr *dict, int rem)
 
 static void
 parse_subnets(struct list_head *head, enum fw3_family family,
-              struct blob_attr *list, int rem)
+              struct blob_attr *list)
 {
 	struct blob_attr *cur;
 	struct fw3_address *addr;
+	int rem;
+
+	if (!list)
+		return;
 
-	__blob_for_each_attr(cur, list, rem)
+	blob_for_each_attr(cur, list, rem)
 	{
 		addr = parse_subnet(family, blobmsg_data(cur), blobmsg_data_len(cur));
 
@@ -83,102 +108,145 @@ 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)
+struct fw3_device *
+fw3_ubus_device(const char *net)
 {
-	int rem;
+	struct fw3_device *dev = NULL;
+	struct blob_attr *c, *cur;
+	unsigned r, rem;
 	char *data;
-	struct blob_attr *cur;
-	struct dev_addr *da = (struct dev_addr *)req->priv;
-	struct fw3_device *dev = da->dev;
+	bool matched;
 
-	if (!msg)
-		return;
+	if (!net || !interfaces)
+		return NULL;
 
-	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));
-	}
+	dev = calloc(1, sizeof(*dev));
+	if (!dev)
+		return NULL;
+
+	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 (!strcmp(blobmsg_name(cur), "device") && !dev->name[0])
+				snprintf(dev->name, sizeof(dev->name), "%s", data);
+			else if (!strcmp(blobmsg_name(cur), "l3_device"))
+				snprintf(dev->name, sizeof(dev->name), "%s", data);
+		}
 
-	if (dev)
 		dev->set = !!dev->name[0];
+		return dev;
+	}
+
+	return NULL;
 }
 
-static void *
-invoke_common(const char *net, bool dev)
+void
+fw3_ubus_address(struct list_head *list, const char *net)
 {
-	uint32_t id;
-	char path[128];
-	static struct dev_addr da;
+	enum {
+		ADDR_INTERFACE,
+		ADDR_IPV4,
+		ADDR_IPV6,
+		ADDR_IPV6_PREFIX,
+		__ADDR_MAX
+	};
+	static const struct blobmsg_policy policy[__ADDR_MAX] = {
+		[ADDR_INTERFACE] = { "interface", BLOBMSG_TYPE_STRING },
+		[ADDR_IPV4] = { "ipv4-address", BLOBMSG_TYPE_ARRAY },
+		[ADDR_IPV6] = { "ipv6-address", BLOBMSG_TYPE_ARRAY },
+		[ADDR_IPV6_PREFIX] = { "ipv6-prefix-assignment", BLOBMSG_TYPE_ARRAY },
+	};
+	struct blob_attr *tb[__ADDR_MAX];
+	struct blob_attr *cur;
+	int rem;
 
-	if (!net)
-		return NULL;
+	if (!net || !interfaces)
+		return;
 
-	memset(&da, 0, sizeof(da));
+	blobmsg_for_each_attr(cur, interfaces, rem) {
+		blobmsg_parse(policy, __ADDR_MAX, tb, blobmsg_data(cur), blobmsg_len(cur));
 
-	if (dev)
-		da.dev = malloc(sizeof(*da.dev));
-	else
-		da.addr = malloc(sizeof(*da.addr));
+		if (!tb[ADDR_INTERFACE] ||
+		    strcmp(blobmsg_data(tb[ADDR_INTERFACE]), net) != 0)
+			continue;
 
-	if ((dev && !da.dev) || (!dev && !da.addr))
-		goto fail;
+		parse_subnets(list, FW3_FAMILY_V4, tb[ADDR_IPV4]);
+		parse_subnets(list, FW3_FAMILY_V6, tb[ADDR_IPV6]);
+		parse_subnets(list, FW3_FAMILY_V6, tb[ADDR_IPV6_PREFIX]);
+	}
+}
 
-	if (dev)
-		memset(da.dev, 0, sizeof(*da.dev));
-	else
-		INIT_LIST_HEAD(da.addr);
+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);
+	}
+}
 
-	snprintf(path, sizeof(path), "network.interface.%s", net);
+void
+fw3_ubus_rules(struct blob_buf *b)
+{
+	blob_buf_init(b, 0);
 
-	if (ubus_lookup_id(ctx, path, &id))
-		goto fail;
+	struct blob_attr *c, *cur, *dcur, *rule, *ropt;
+	unsigned r, rem, drem, rrem, orem;
 
-	if (ubus_invoke(ctx, id, "status", NULL, invoke_cb, &da, 500))
-		goto fail;
+	blobmsg_for_each_attr(c, interfaces, r) {
+		const char *l3_device = NULL;
+		struct blob_attr *data = NULL;
 
-	if (dev && da.dev->set)
-		return da.dev;
-	else if (!dev && !list_empty(da.addr))
-		return da.addr;
+		blobmsg_for_each_attr(cur, c, rem) {
+			if (!strcmp(blobmsg_name(cur), "l3_device"))
+				l3_device = blobmsg_get_string(cur);
+			else if (!strcmp(blobmsg_name(cur), "data"))
+				data = cur;
+		}
 
-fail:
-	if (da.dev)
-		free(da.dev);
+		if (!data || !l3_device)
+			continue;
 
-	if (da.addr)
-		free(da.addr);
+		blobmsg_for_each_attr(dcur, data, drem) {
+			if (strcmp(blobmsg_name(dcur), "firewall"))
+				continue;
 
-	return NULL;
-}
+			blobmsg_for_each_attr(rule, dcur, rrem) {
+				void *k = blobmsg_open_table(b, "");
 
-struct fw3_device *
-fw3_ubus_device(const char *net)
-{
-	return invoke_common(net, true);
-}
+				blobmsg_for_each_attr(ropt, rule, orem)
+					if (strcmp(blobmsg_name(ropt), "device"))
+						blobmsg_add_blob(b, ropt);
 
-struct list_head *
-fw3_ubus_address(const char *net)
-{
-	return invoke_common(net, false);
+				blobmsg_add_string(b, "device", l3_device);
+				blobmsg_close_table(b, k);
+			}
+		}
+	}
 }