ubus: fix fw3_ubus_address()

[project/firewall3.git] / ubus.c

diff --git a/ubus.c b/ubus.c
index 581f51c..5161922 100644 (file)
--- a/ubus.c
+++ b/ubus.c
@@ -105,16 +105,15 @@ parse_subnet(enum fw3_family family, struct blob_attr *dict, int rem)
 
 static void
 parse_subnets(struct list_head *head, enum fw3_family family,
-              struct blob_attr *list)
+              struct blob_attr *list, int rem)
 {
        struct blob_attr *cur;
        struct fw3_address *addr;
-       int rem;
 
        if (!list)
                return;
 
-       blob_for_each_attr(cur, list, rem)
+       __blob_for_each_attr(cur, list, rem)
        {
                addr = parse_subnet(family, blobmsg_data(cur), blobmsg_data_len(cur));
 
@@ -140,18 +139,13 @@ fw3_ubus_device(const char *net)
        struct fw3_device *dev = NULL;
        struct blob_attr *tb[__DEV_MAX];
        struct blob_attr *cur;
+       char *name = NULL;
        int rem;
 
        if (!net || !interfaces)
                return NULL;
 
-       dev = calloc(1, sizeof(*dev));
-       if (!dev)
-               return NULL;
-
        blobmsg_for_each_attr(cur, interfaces, rem) {
-               char *name;
-
                blobmsg_parse(policy, __DEV_MAX, tb, blobmsg_data(cur), blobmsg_len(cur));
                if (!tb[DEV_INTERFACE] ||
                    strcmp(blobmsg_data(tb[DEV_INTERFACE]), net) != 0)
@@ -164,12 +158,21 @@ fw3_ubus_device(const char *net)
                else
                        continue;
 
-               snprintf(dev->name, sizeof(dev->name), "%s", name);
-               dev->set = !!dev->name[0];
-               return dev;
+               break;
        }
 
-       return NULL;
+       if (!name)
+               return NULL;
+
+       dev = calloc(1, sizeof(*dev));
+
+       if (!dev)
+               return NULL;
+
+       snprintf(dev->name, sizeof(dev->name), "%s", name);
+       dev->set = true;
+
+       return dev;
 }
 
 void
@@ -202,9 +205,9 @@ 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]);
+               parse_subnets(list, FW3_FAMILY_V4, blobmsg_data(tb[ADDR_IPV4]), blobmsg_data_len(tb[ADDR_IPV4]));
+               parse_subnets(list, FW3_FAMILY_V6, blobmsg_data(tb[ADDR_IPV6]), blobmsg_data_len(tb[ADDR_IPV6]));
+               parse_subnets(list, FW3_FAMILY_V6, blobmsg_data(tb[ADDR_IPV6_PREFIX]), blobmsg_data_len(tb[ADDR_IPV6_PREFIX]));
        }
 }