diff options
author | Jo-Philipp Wich <jow@openwrt.org> | 2014-07-10 11:15:03 +0200 |
---|---|---|
committer | Jo-Philipp Wich <jow@openwrt.org> | 2014-07-10 12:06:33 +0200 |
commit | fb51b4bdea243b2131dce324cb0b71be339a1ab4 (patch) | |
tree | e9835a16630ea636a608ecaaf4349456f75dade5 | |
parent | a4dec0d88c144d0e973c1884531e27c7499c27a2 (diff) | |
download | firewall3-fb51b4bdea243b2131dce324cb0b71be339a1ab4.tar.gz |
ubus: fix fw3_ubus_address()
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
-rw-r--r-- | ubus.c | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -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)); @@ -206,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])); } } |