cmake: Find uci.h

[project/firewall3.git] / ubus.c

diff --git a/ubus.c b/ubus.c
index 8e5e60e..e5326f9 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
@@ -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;
@@ -114,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));
 
@@ -244,15 +246,22 @@ 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;
+       unsigned n, r, rem, drem, rrem, orem;
+       char comment[256];
 
        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_proto = blobmsg_get_string(cur);
+                       else if (!strcmp(blobmsg_name(cur), "proto"))
+                               iface_name = blobmsg_get_string(cur);
                        else if (!strcmp(blobmsg_name(cur), "data"))
                                data = cur;
                }
@@ -264,13 +273,22 @@ fw3_ubus_rules(struct blob_buf *b)
                        if (strcmp(blobmsg_name(dcur), "firewall"))
                                continue;
 
+                       n = 0;
+
                        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"))
+                               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), "device"))
+                                               l3_device = blobmsg_get_string(ropt);
+                                       else if (strcmp(blobmsg_name(ropt), "name"))
                                                blobmsg_add_blob(b, ropt);
+                               }
 
+                               blobmsg_add_string(b, "name", comment);
                                blobmsg_add_string(b, "device", l3_device);
                                blobmsg_close_table(b, k);
                        }
@@ -295,8 +313,21 @@ fw3_ubus_rules(struct blob_buf *b)
                                if (!blobmsg_check_attr(dcur, true))
                                        continue;
 
-                               blobmsg_for_each_attr(rule, dcur, rrem)
-                                       blobmsg_add_blob(b, rule);
+                               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++);
+
+                                       blobmsg_for_each_attr(ropt, rule, orem)
+                                               if (strcmp(blobmsg_name(ropt), "name"))
+                                                       blobmsg_add_blob(b, ropt);
+
+                                       blobmsg_add_string(b, "name", comment);
+                                       blobmsg_close_table(b, k);
+                               }
                        }
                }
        }