{
if (!strcmp(blobmsg_name(cur), "address"))
inet_pton(family == FW3_FAMILY_V4 ? AF_INET : AF_INET6,
- blobmsg_data(cur), &addr->address.v6);
+ blobmsg_get_string(cur), &addr->address.v6);
else if (!strcmp(blobmsg_name(cur), "mask"))
- addr->mask = be32_to_cpu(*(uint32_t *)blobmsg_data(cur));
+ fw3_bitlen2netmask(family, blobmsg_get_u32(cur), &addr->mask.v6);
}
return addr;
static void
parse_subnets(struct list_head *head, enum fw3_family family,
- struct blob_attr *list, int rem)
+ struct blob_attr *list)
{
struct blob_attr *cur;
struct fw3_address *addr;
+ int rem;
if (!list)
return;
- __blob_for_each_attr(cur, list, rem)
+ rem = blobmsg_data_len(list);
+
+ __blob_for_each_attr(cur, blobmsg_data(list), rem)
{
addr = parse_subnet(family, blobmsg_data(cur), blobmsg_data_len(cur));
strcmp(blobmsg_data(tb[ADDR_INTERFACE]), net) != 0)
continue;
- 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]));
+ 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]);
}
}