/*
* firewall3 - 3rd OpenWrt UCI firewall implementation
*
- * Copyright (C) 2013 Jo-Philipp Wich <jow@openwrt.org>
+ * Copyright (C) 2013 Jo-Philipp Wich <jo@mein.io>
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
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;
}
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_for_each_attr(ropt, rule, orem) {
+ if (!strcmp(blobmsg_name(ropt), "device"))
+ l3_device = blobmsg_get_string(ropt);
+ else if (strcmp(blobmsg_name(ropt), "name"))
blobmsg_add_blob(b, ropt);
+ }
blobmsg_add_string(b, "name", comment);
blobmsg_add_string(b, "device", l3_device);