X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=ubus.c;h=7029d630af60f54298f929acf581a7afe0c223f6;hp=ef2c53027dfb88f0b941a965b9321695ad02f84b;hb=0e77bf296648c5db92c269c678d27f6846de4e9f;hpb=dba19a8f14cefdede3cc7d0f8322fdb9a2c44d50 diff --git a/ubus.c b/ubus.c index ef2c530..7029d63 100644 --- a/ubus.c +++ b/ubus.c @@ -1,7 +1,7 @@ /* * firewall3 - 3rd OpenWrt UCI firewall implementation * - * Copyright (C) 2013 Jo-Philipp Wich + * Copyright (C) 2013 Jo-Philipp Wich * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -51,7 +51,7 @@ fw3_ubus_connect(void) if (ubus_lookup_id(ctx, "network.interface", &id)) goto out; - if (ubus_invoke(ctx, id, "dump", NULL, dump_cb, NULL, 500)) + if (ubus_invoke(ctx, id, "dump", NULL, dump_cb, NULL, 2000)) goto out; status = true; @@ -103,16 +103,16 @@ parse_subnet(enum fw3_family family, struct blob_attr *dict, int rem) return addr; } -static void +static int parse_subnets(struct list_head *head, enum fw3_family family, struct blob_attr *list) { struct blob_attr *cur; struct fw3_address *addr; - int rem; + int rem, n = 0; if (!list) - return; + return 0; rem = blobmsg_data_len(list); @@ -121,8 +121,13 @@ parse_subnets(struct list_head *head, enum fw3_family family, addr = parse_subnet(family, blobmsg_data(cur), blobmsg_data_len(cur)); if (addr) + { list_add_tail(&addr->list, head); + n++; + } } + + return n; } struct fw3_device * @@ -178,7 +183,7 @@ fw3_ubus_device(const char *net) return dev; } -void +int fw3_ubus_address(struct list_head *list, const char *net) { enum { @@ -196,10 +201,10 @@ fw3_ubus_address(struct list_head *list, const char *net) }; struct blob_attr *tb[__ADDR_MAX]; struct blob_attr *cur; - int rem; + int rem, n = 0; if (!net || !interfaces) - return; + return 0; blobmsg_for_each_attr(cur, interfaces, rem) { blobmsg_parse(policy, __ADDR_MAX, tb, blobmsg_data(cur), blobmsg_len(cur)); @@ -208,10 +213,12 @@ 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]); + 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]); } + + return n; } void @@ -240,14 +247,47 @@ fw3_ubus_zone_devices(struct fw3_zone *zone) } } +static void fw3_ubus_rules_add(struct blob_buf *b, const char *service, + const char *instance, const char *device, + const struct blob_attr *rule, unsigned n) +{ + void *k = blobmsg_open_table(b, ""); + struct blob_attr *ropt; + unsigned orem; + char *type = NULL; + char comment[256]; + + blobmsg_for_each_attr(ropt, rule, orem) { + if (!strcmp(blobmsg_name(ropt), "type")) + type = blobmsg_data(ropt); + if (device && !strcmp(blobmsg_name(ropt), "device")) + device = blobmsg_get_string(ropt); + else if (strcmp(blobmsg_name(ropt), "name")) + blobmsg_add_blob(b, ropt); + } + + if (instance) + snprintf(comment, sizeof(comment), "ubus:%s[%s] %s %d", + service, instance, type ? type : "rule", n); + else + snprintf(comment, sizeof(comment), "ubus:%s %s %d", + service, type ? type : "rule", n); + + blobmsg_add_string(b, "name", comment); + + if (device) + blobmsg_add_string(b, "device", device); + + blobmsg_close_table(b, k); +} + void fw3_ubus_rules(struct blob_buf *b) { blob_buf_init(b, 0); - struct blob_attr *c, *cur, *dcur, *rule, *ropt; - unsigned n, r, rem, drem, rrem, orem; - char comment[256]; + struct blob_attr *c, *cur, *dcur, *rule; + unsigned n, r, rem, drem, rrem; blobmsg_for_each_attr(c, interfaces, r) { const char *l3_device = NULL; @@ -259,9 +299,9 @@ fw3_ubus_rules(struct blob_buf *b) if (!strcmp(blobmsg_name(cur), "l3_device")) l3_device = blobmsg_get_string(cur); else if (!strcmp(blobmsg_name(cur), "interface")) - iface_proto = blobmsg_get_string(cur); - else if (!strcmp(blobmsg_name(cur), "proto")) iface_name = blobmsg_get_string(cur); + else if (!strcmp(blobmsg_name(cur), "proto")) + iface_proto = blobmsg_get_string(cur); else if (!strcmp(blobmsg_name(cur), "data")) data = cur; } @@ -275,21 +315,9 @@ fw3_ubus_rules(struct blob_buf *b) n = 0; - blobmsg_for_each_attr(rule, dcur, rrem) { - void *k = blobmsg_open_table(b, ""); - - snprintf(comment, sizeof(comment), "ubus:%s[%s] rule %d", - iface_name, iface_proto, n++); - - blobmsg_for_each_attr(ropt, rule, orem) - if (strcmp(blobmsg_name(ropt), "name") && - strcmp(blobmsg_name(ropt), "device")) - blobmsg_add_blob(b, ropt); - - blobmsg_add_string(b, "name", comment); - blobmsg_add_string(b, "device", l3_device); - blobmsg_close_table(b, k); - } + blobmsg_for_each_attr(rule, dcur, rrem) + fw3_ubus_rules_add(b, iface_name, iface_proto, + l3_device, rule, n++); } } @@ -306,26 +334,30 @@ fw3_ubus_rules(struct blob_buf *b) if (!blobmsg_check_attr(cur, true)) continue; + /* fw rules within the service itself */ + if (!strcmp(blobmsg_name(cur), "firewall")) { + n = 0; + + blobmsg_for_each_attr(rule, cur, rrem) + fw3_ubus_rules_add(b, blobmsg_name(c), + NULL, NULL, rule, n++); + + continue; + } + /* type */ blobmsg_for_each_attr(dcur, cur, drem) { if (!blobmsg_check_attr(dcur, true)) continue; - n = 0; - - blobmsg_for_each_attr(rule, dcur, rrem) { - void *k = blobmsg_open_table(b, ""); - - snprintf(comment, sizeof(comment), "ubus:%s[%s] rule %d", - blobmsg_name(c), blobmsg_name(cur), n++); + if (strcmp(blobmsg_name(dcur), "firewall")) + continue; - blobmsg_for_each_attr(ropt, rule, orem) - if (strcmp(blobmsg_name(ropt), "name")) - blobmsg_add_blob(b, ropt); + n = 0; - blobmsg_add_string(b, "name", comment); - blobmsg_close_table(b, k); - } + blobmsg_for_each_attr(rule, dcur, rrem) + fw3_ubus_rules_add(b, blobmsg_name(c), + blobmsg_name(cur), NULL, rule, n++); } } }