redirects: fix segmentation fault

[oweals/firewall3.git] / ubus.c

diff --git a/ubus.c b/ubus.c
index 7029d630af60f54298f929acf581a7afe0c223f6..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;
 }
 
@@ -254,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);