firewall3: ubus: parse the firewall data within the service itself

[project/firewall3.git] / ubus.c

diff --git a/ubus.c b/ubus.c
index 0d83e0f..5bb4f5d 100644 (file)
--- 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;
@@ -94,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;
@@ -240,21 +240,61 @@ 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 r, rem, drem, rrem, orem;
+       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;
+               const char *iface_proto = "unknown";
+               const char *iface_name = "unknown";
                struct blob_attr *data = NULL;
 
                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), "interface"))
+                               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;
                }
@@ -266,16 +306,11 @@ fw3_ubus_rules(struct blob_buf *b)
                        if (strcmp(blobmsg_name(dcur), "firewall"))
                                continue;
 
-                       blobmsg_for_each_attr(rule, dcur, rrem) {
-                               void *k = blobmsg_open_table(b, "");
-
-                               blobmsg_for_each_attr(ropt, rule, orem)
-                                       if (strcmp(blobmsg_name(ropt), "device"))
-                                               blobmsg_add_blob(b, ropt);
+                       n = 0;
 
-                               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++);
                }
        }
 
@@ -292,13 +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;
 
+                               if (strcmp(blobmsg_name(dcur), "firewall"))
+                                       continue;
+
+                               n = 0;
+
                                blobmsg_for_each_attr(rule, dcur, rrem)
-                                       blobmsg_add_blob(b, rule);
+                                       fw3_ubus_rules_add(b, blobmsg_name(c),
+                                               blobmsg_name(cur), NULL, rule, n++);
                        }
                }
        }