{
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;
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));
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)
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