summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
53ef9f1)
It gives the ability to display the section type for
rules pushed via procd services and netifd interface
firewall data.
Signed-off-by: Pierre Lebleu <pme.lebleu@gmail.com>
blobmsg_for_each_attr(rule, dcur, rrem) {
void *k = blobmsg_open_table(b, "");
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) {
blobmsg_for_each_attr(ropt, rule, orem) {
+ if (!strcmp(blobmsg_name(ropt), "type"))
+ type = blobmsg_data(ropt);
if (!strcmp(blobmsg_name(ropt), "device"))
l3_device = blobmsg_get_string(ropt);
else if (strcmp(blobmsg_name(ropt), "name"))
blobmsg_add_blob(b, ropt);
}
if (!strcmp(blobmsg_name(ropt), "device"))
l3_device = blobmsg_get_string(ropt);
else if (strcmp(blobmsg_name(ropt), "name"))
blobmsg_add_blob(b, ropt);
}
+ snprintf(comment, sizeof(comment), "ubus:%s[%s] %s %d",
+ iface_name, iface_proto,
+ type ? type : "rule", n++);
+
blobmsg_add_string(b, "name", comment);
blobmsg_add_string(b, "name", comment);
blobmsg_add_string(b, "device", l3_device);
blobmsg_close_table(b, k);
}
blobmsg_add_string(b, "device", l3_device);
blobmsg_close_table(b, k);
}
blobmsg_for_each_attr(rule, dcur, rrem) {
void *k = blobmsg_open_table(b, "");
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++);
-
- blobmsg_for_each_attr(ropt, rule, orem)
+ blobmsg_for_each_attr(ropt, rule, orem) {
+ if (!strcmp(blobmsg_name(ropt), "type"))
+ type = blobmsg_data(ropt);
if (strcmp(blobmsg_name(ropt), "name"))
blobmsg_add_blob(b, ropt);
if (strcmp(blobmsg_name(ropt), "name"))
blobmsg_add_blob(b, ropt);
+ }
+
+ snprintf(comment, sizeof(comment), "ubus:%s[%s] %s %d",
+ blobmsg_name(c), blobmsg_name(cur),
+ type ? type : "rule", n++);
blobmsg_add_string(b, "name", comment);
blobmsg_close_table(b, k);
blobmsg_add_string(b, "name", comment);
blobmsg_close_table(b, k);