X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=ubus.c;h=5bb4f5d5ce69413da973e5b37493c14c6e70b02b;hp=ef2c53027dfb88f0b941a965b9321695ad02f84b;hb=c4309372acc7e1bef8aa230269f7da1dec790e68;hpb=dba19a8f14cefdede3cc7d0f8322fdb9a2c44d50

diff --git a/ubus.c b/ubus.c
index ef2c530..5bb4f5d 100644
--- a/ubus.c
+++ b/ubus.c
@@ -1,7 +1,7 @@
 /*
  * firewall3 - 3rd OpenWrt UCI firewall implementation
  *
- *   Copyright (C) 2013 Jo-Philipp Wich <jow@openwrt.org>
+ *   Copyright (C) 2013 Jo-Philipp Wich <jo@mein.io>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -51,7 +51,7 @@ fw3_ubus_connect(void)
 	if (ubus_lookup_id(ctx, "network.interface", &id))
 		goto out;
 
-	if (ubus_invoke(ctx, id, "dump", NULL, dump_cb, NULL, 500))
+	if (ubus_invoke(ctx, id, "dump", NULL, dump_cb, NULL, 2000))
 		goto out;
 
 	status = true;
@@ -240,14 +240,47 @@ fw3_ubus_zone_devices(struct fw3_zone *zone)
 	}
 }
 
+static void fw3_ubus_rules_add(struct blob_buf *b, const char *service,
+		const char *instance, const char *device,
+		const struct blob_attr *rule, unsigned n)
+{
+	void *k = blobmsg_open_table(b, "");
+	struct blob_attr *ropt;
+	unsigned orem;
+	char *type = NULL;
+	char comment[256];
+
+	blobmsg_for_each_attr(ropt, rule, orem) {
+		if (!strcmp(blobmsg_name(ropt), "type"))
+			type = blobmsg_data(ropt);
+		if (device && !strcmp(blobmsg_name(ropt), "device"))
+			device = blobmsg_get_string(ropt);
+		else if (strcmp(blobmsg_name(ropt), "name"))
+			blobmsg_add_blob(b, ropt);
+	}
+
+	if (instance)
+		snprintf(comment, sizeof(comment), "ubus:%s[%s] %s %d",
+				service, instance, type ? type : "rule", n);
+	else
+		snprintf(comment, sizeof(comment), "ubus:%s %s %d",
+				service, type ? type : "rule", n);
+
+	blobmsg_add_string(b, "name", comment);
+
+	if (device)
+		blobmsg_add_string(b, "device", device);
+
+	blobmsg_close_table(b, k);
+}
+
 void
 fw3_ubus_rules(struct blob_buf *b)
 {
 	blob_buf_init(b, 0);
 
-	struct blob_attr *c, *cur, *dcur, *rule, *ropt;
-	unsigned n, r, rem, drem, rrem, orem;
-	char comment[256];
+	struct blob_attr *c, *cur, *dcur, *rule;
+	unsigned n, r, rem, drem, rrem;
 
 	blobmsg_for_each_attr(c, interfaces, r) {
 		const char *l3_device = NULL;
@@ -259,9 +292,9 @@ fw3_ubus_rules(struct blob_buf *b)
 			if (!strcmp(blobmsg_name(cur), "l3_device"))
 				l3_device = blobmsg_get_string(cur);
 			else if (!strcmp(blobmsg_name(cur), "interface"))
-				iface_proto = blobmsg_get_string(cur);
-			else if (!strcmp(blobmsg_name(cur), "proto"))
 				iface_name = blobmsg_get_string(cur);
+			else if (!strcmp(blobmsg_name(cur), "proto"))
+				iface_proto = blobmsg_get_string(cur);
 			else if (!strcmp(blobmsg_name(cur), "data"))
 				data = cur;
 		}
@@ -275,21 +308,9 @@ fw3_ubus_rules(struct blob_buf *b)
 
 			n = 0;
 
-			blobmsg_for_each_attr(rule, dcur, rrem) {
-				void *k = blobmsg_open_table(b, "");
-
-				snprintf(comment, sizeof(comment), "ubus:%s[%s] rule %d",
-				         iface_name, iface_proto, n++);
-
-				blobmsg_for_each_attr(ropt, rule, orem)
-					if (strcmp(blobmsg_name(ropt), "name") &&
-					    strcmp(blobmsg_name(ropt), "device"))
-						blobmsg_add_blob(b, ropt);
-
-				blobmsg_add_string(b, "name", comment);
-				blobmsg_add_string(b, "device", l3_device);
-				blobmsg_close_table(b, k);
-			}
+			blobmsg_for_each_attr(rule, dcur, rrem)
+				fw3_ubus_rules_add(b, iface_name, iface_proto,
+					l3_device, rule, n++);
 		}
 	}
 
@@ -306,26 +327,30 @@ fw3_ubus_rules(struct blob_buf *b)
 			if (!blobmsg_check_attr(cur, true))
 				continue;
 
+			/* fw rules within the service itself */
+			if (!strcmp(blobmsg_name(cur), "firewall")) {
+				n = 0;
+
+				blobmsg_for_each_attr(rule, cur, rrem)
+					fw3_ubus_rules_add(b, blobmsg_name(c),
+						NULL, NULL, rule, n++);
+
+				continue;
+			}
+
 			/* type */
 			blobmsg_for_each_attr(dcur, cur, drem) {
 				if (!blobmsg_check_attr(dcur, true))
 					continue;
 
-				n = 0;
-
-				blobmsg_for_each_attr(rule, dcur, rrem) {
-					void *k = blobmsg_open_table(b, "");
-
-					snprintf(comment, sizeof(comment), "ubus:%s[%s] rule %d",
-					         blobmsg_name(c), blobmsg_name(cur), n++);
+				if (strcmp(blobmsg_name(dcur), "firewall"))
+					continue;
 
-					blobmsg_for_each_attr(ropt, rule, orem)
-						if (strcmp(blobmsg_name(ropt), "name"))
-							blobmsg_add_blob(b, ropt);
+				n = 0;
 
-					blobmsg_add_string(b, "name", comment);
-					blobmsg_close_table(b, k);
-				}
+				blobmsg_for_each_attr(rule, dcur, rrem)
+					fw3_ubus_rules_add(b, blobmsg_name(c),
+						blobmsg_name(cur), NULL, rule, n++);
 			}
 		}
 	}