X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=ubus.c;h=3031e84e9f8158da421ee1468c881549d11d636f;hp=877104ad29aeb2cafa454a9532b95c05d1036296;hb=8dd290b85ee8d57026581891e9a34945d077fa3b;hpb=203d616e3ce62d9d8cd3b2e11b8a757c97d7da0f

diff --git a/ubus.c b/ubus.c
index 877104a..3031e84 100644
--- a/ubus.c
+++ b/ubus.c
@@ -19,6 +19,7 @@
 #include "ubus.h"
 
 static struct blob_attr *interfaces = NULL;
+static struct blob_attr *procd_data;
 
 
 static void dump_cb(struct ubus_request *req, int type, struct blob_attr *msg)
@@ -31,12 +32,18 @@ static void dump_cb(struct ubus_request *req, int type, struct blob_attr *msg)
 		interfaces = blob_memdup(cur);
 }
 
+static void procd_data_cb(struct ubus_request *req, int type, struct blob_attr *msg)
+{
+	procd_data = blob_memdup(msg);
+}
+
 bool
 fw3_ubus_connect(void)
 {
 	bool status = false;
 	uint32_t id;
 	struct ubus_context *ctx = ubus_connect(NULL);
+	struct blob_buf b = { };
 
 	if (!ctx)
 		goto out;
@@ -49,6 +56,14 @@ fw3_ubus_connect(void)
 
 	status = true;
 
+	if (ubus_lookup_id(ctx, "service", &id))
+		goto out;
+
+	blob_buf_init(&b, 0);
+	blobmsg_add_string(&b, "type", "firewall");
+	ubus_invoke(ctx, id, "get_data", b.head, procd_data_cb, NULL, 2000);
+	blob_buf_free(&b);
+
 out:
 	if (ctx)
 		ubus_free(ctx);
@@ -79,10 +94,10 @@ parse_subnet(enum fw3_family family, struct blob_attr *dict, int rem)
 	{
 		if (!strcmp(blobmsg_name(cur), "address"))
 			inet_pton(family == FW3_FAMILY_V4 ? AF_INET : AF_INET6,
-			          blobmsg_data(cur), &addr->address.v6);
+			          blobmsg_get_string(cur), &addr->address.v6);
 
 		else if (!strcmp(blobmsg_name(cur), "mask"))
-			addr->mask = be32_to_cpu(*(uint32_t *)blobmsg_data(cur));
+			fw3_bitlen2netmask(family, blobmsg_get_u32(cur), &addr->mask.v6);
 	}
 
 	return addr;
@@ -99,7 +114,9 @@ parse_subnets(struct list_head *head, enum fw3_family family,
 	if (!list)
 		return;
 
-	blob_for_each_attr(cur, list, rem)
+	rem = blobmsg_data_len(list);
+
+	__blob_for_each_attr(cur, blobmsg_data(list), rem)
 	{
 		addr = parse_subnet(family, blobmsg_data(cur), blobmsg_data_len(cur));
 
@@ -125,18 +142,13 @@ fw3_ubus_device(const char *net)
 	struct fw3_device *dev = NULL;
 	struct blob_attr *tb[__DEV_MAX];
 	struct blob_attr *cur;
+	char *name = NULL;
 	int rem;
 
 	if (!net || !interfaces)
 		return NULL;
 
-	dev = calloc(1, sizeof(*dev));
-	if (!dev)
-		return NULL;
-
 	blobmsg_for_each_attr(cur, interfaces, rem) {
-		char *name;
-
 		blobmsg_parse(policy, __DEV_MAX, tb, blobmsg_data(cur), blobmsg_len(cur));
 		if (!tb[DEV_INTERFACE] ||
 		    strcmp(blobmsg_data(tb[DEV_INTERFACE]), net) != 0)
@@ -149,12 +161,21 @@ fw3_ubus_device(const char *net)
 		else
 			continue;
 
-		snprintf(dev->name, sizeof(dev->name), "%s", name);
-		dev->set = !!dev->name[0];
-		return dev;
+		break;
 	}
 
-	return NULL;
+	if (!name)
+		return NULL;
+
+	dev = calloc(1, sizeof(*dev));
+
+	if (!dev)
+		return NULL;
+
+	snprintf(dev->name, sizeof(dev->name), "%s", name);
+	dev->set = true;
+
+	return dev;
 }
 
 void
@@ -257,4 +278,28 @@ fw3_ubus_rules(struct blob_buf *b)
 			}
 		}
 	}
+
+	if (!procd_data)
+		return;
+
+	/* service */
+	blobmsg_for_each_attr(c, procd_data, r) {
+		if (!blobmsg_check_attr(c, true))
+			continue;
+
+		/* instance */
+		blobmsg_for_each_attr(cur, c, rem) {
+			if (!blobmsg_check_attr(cur, true))
+				continue;
+
+			/* type */
+			blobmsg_for_each_attr(dcur, cur, drem) {
+				if (!blobmsg_check_attr(dcur, true))
+					continue;
+
+				blobmsg_for_each_attr(rule, dcur, rrem)
+					blobmsg_add_blob(b, rule);
+			}
+		}
+	}
 }