Dynamically create rules for available libext*.a libraries, clean up rules

[project/firewall3.git] / ubus.c

diff --git a/ubus.c b/ubus.c
index 0647bc3..d5f52b9 100644 (file)
--- a/ubus.c
+++ b/ubus.c
@@ -113,7 +113,8 @@ invoke_cb(struct ubus_request *req, int type, struct blob_attr *msg)
                else if (!dev && !strcmp(blobmsg_name(cur), "ipv4-address"))
                        parse_subnets(da->addr, FW3_FAMILY_V4,
                                      blobmsg_data(cur), blobmsg_data_len(cur));
                else if (!dev && !strcmp(blobmsg_name(cur), "ipv4-address"))
                        parse_subnets(da->addr, FW3_FAMILY_V4,
                                      blobmsg_data(cur), blobmsg_data_len(cur));

-               else if (!dev && !strcmp(blobmsg_name(cur), "ipv6-address"))
+               else if (!dev && (!strcmp(blobmsg_name(cur), "ipv6-address") ||
+                                 !strcmp(blobmsg_name(cur), "ipv6-prefix-assignment")))

                        parse_subnets(da->addr, FW3_FAMILY_V6,
                                      blobmsg_data(cur), blobmsg_data_len(cur));
        }
                        parse_subnets(da->addr, FW3_FAMILY_V6,
                                      blobmsg_data(cur), blobmsg_data_len(cur));
        }


@@ -181,17 +182,3 @@ fw3_ubus_address(const char *net)
 {
        return invoke_common(net, false);
 }
 {
        return invoke_common(net, false);
 }

-
-void
-fw3_ubus_address_free(struct list_head *list)
-{
-       struct fw3_address *addr, *tmp;
-
-       list_for_each_entry_safe(addr, tmp, list, list)
-       {
-               list_del(&addr->list);
-               free(addr);
-       }
-
-       free(list);
-}