redirects: fix segmentation fault

[oweals/firewall3.git] / ubus.c

diff --git a/ubus.c b/ubus.c
index 5bb4f5d5ce69413da973e5b37493c14c6e70b02b..cf5c8b103d72a9b9f59d764d29e8c09ad64e35a5 100644 (file)
--- a/ubus.c
+++ b/ubus.c
@@ -45,13 +45,15 @@ fw3_ubus_connect(void)
        struct ubus_context *ctx = ubus_connect(NULL);
        struct blob_buf b = { };
 
+       blob_buf_init(&b, 0);
+
        if (!ctx)
                goto out;
 
        if (ubus_lookup_id(ctx, "network.interface", &id))
                goto out;
 
-       if (ubus_invoke(ctx, id, "dump", NULL, dump_cb, NULL, 2000))
+       if (ubus_invoke(ctx, id, "dump", b.head, dump_cb, NULL, 2000))
                goto out;
 
        status = true;
@@ -59,14 +61,15 @@ fw3_ubus_connect(void)
        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:
+       blob_buf_free(&b);
+
        if (ctx)
                ubus_free(ctx);
+
        return status;
 }
 
@@ -103,16 +106,16 @@ parse_subnet(enum fw3_family family, struct blob_attr *dict, int rem)
        return addr;
 }
 
-static void
+static int
 parse_subnets(struct list_head *head, enum fw3_family family,
               struct blob_attr *list)
 {
        struct blob_attr *cur;
        struct fw3_address *addr;
-       int rem;
+       int rem, n = 0;
 
        if (!list)
-               return;
+               return 0;
 
        rem = blobmsg_data_len(list);
 
@@ -121,8 +124,13 @@ parse_subnets(struct list_head *head, enum fw3_family family,
                addr = parse_subnet(family, blobmsg_data(cur), blobmsg_data_len(cur));
 
                if (addr)
+               {
                        list_add_tail(&addr->list, head);
+                       n++;
+               }
        }
+
+       return n;
 }
 
 struct fw3_device *
@@ -178,7 +186,7 @@ fw3_ubus_device(const char *net)
        return dev;
 }
 
-void
+int
 fw3_ubus_address(struct list_head *list, const char *net)
 {
        enum {
@@ -196,10 +204,10 @@ fw3_ubus_address(struct list_head *list, const char *net)
        };
        struct blob_attr *tb[__ADDR_MAX];
        struct blob_attr *cur;
-       int rem;
+       int rem, n = 0;
 
        if (!net || !interfaces)
-               return;
+               return 0;
 
        blobmsg_for_each_attr(cur, interfaces, rem) {
                blobmsg_parse(policy, __ADDR_MAX, tb, blobmsg_data(cur), blobmsg_len(cur));
@@ -208,10 +216,12 @@ fw3_ubus_address(struct list_head *list, const char *net)
                    strcmp(blobmsg_data(tb[ADDR_INTERFACE]), net) != 0)
                        continue;
 
-               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]);
+               n += parse_subnets(list, FW3_FAMILY_V4, tb[ADDR_IPV4]);
+               n += parse_subnets(list, FW3_FAMILY_V6, tb[ADDR_IPV6]);
+               n += parse_subnets(list, FW3_FAMILY_V6, tb[ADDR_IPV6_PREFIX]);
        }
+
+       return n;
 }
 
 void
@@ -247,26 +257,34 @@ static void fw3_ubus_rules_add(struct blob_buf *b, const char *service,
        void *k = blobmsg_open_table(b, "");
        struct blob_attr *ropt;
        unsigned orem;
-       char *type = NULL;
+       char *type = NULL, *name = NULL;
        char comment[256];
 
        blobmsg_for_each_attr(ropt, rule, orem) {
                if (!strcmp(blobmsg_name(ropt), "type"))
                        type = blobmsg_data(ropt);
+               else if (!strcmp(blobmsg_name(ropt), "name"))
+                       name = 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);
+       if (!type || strcmp(type, "ipset")) {
+               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);
+               blobmsg_add_string(b, "name", comment);
+       }
+       else if (name) {
+               blobmsg_add_string(b, "name", name);
+       }
 
        if (device)
                blobmsg_add_string(b, "device", device);