Change fw3_ubus_address() to return the number of addresses resolved from
the given network name, this will be required to handle failed resolving
in higher layers later on.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
parse_subnets(struct list_head *head, enum fw3_family family,
struct blob_attr *list)
{
struct blob_attr *cur;
struct fw3_address *addr;
parse_subnets(struct list_head *head, enum fw3_family family,
struct blob_attr *list)
{
struct blob_attr *cur;
struct fw3_address *addr;
rem = blobmsg_data_len(list);
rem = blobmsg_data_len(list);
addr = parse_subnet(family, blobmsg_data(cur), blobmsg_data_len(cur));
if (addr)
addr = parse_subnet(family, blobmsg_data(cur), blobmsg_data_len(cur));
if (addr)
list_add_tail(&addr->list, head);
list_add_tail(&addr->list, head);
fw3_ubus_address(struct list_head *list, const char *net)
{
enum {
fw3_ubus_address(struct list_head *list, const char *net)
{
enum {
};
struct blob_attr *tb[__ADDR_MAX];
struct blob_attr *cur;
};
struct blob_attr *tb[__ADDR_MAX];
struct blob_attr *cur;
blobmsg_for_each_attr(cur, interfaces, rem) {
blobmsg_parse(policy, __ADDR_MAX, tb, blobmsg_data(cur), blobmsg_len(cur));
blobmsg_for_each_attr(cur, interfaces, rem) {
blobmsg_parse(policy, __ADDR_MAX, tb, blobmsg_data(cur), blobmsg_len(cur));
strcmp(blobmsg_data(tb[ADDR_INTERFACE]), net) != 0)
continue;
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]);
+ n += parse_subnets(list, FW3_FAMILY_V4, tb[ADDR_IPV4]);
+ n += parse_subnets(list, FW3_FAMILY_V6, tb[ADDR_IPV6]);
+ n += parse_subnets(list, FW3_FAMILY_V6, tb[ADDR_IPV6_PREFIX]);
struct fw3_device * fw3_ubus_device(const char *net);
struct fw3_device * fw3_ubus_device(const char *net);
-void fw3_ubus_address(struct list_head *list, const char *net);
+int fw3_ubus_address(struct list_head *list, const char *net);
void fw3_ubus_zone_devices(struct fw3_zone *zone);
void fw3_ubus_zone_devices(struct fw3_zone *zone);