X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=ubus.c;h=f353d015fefc4bb54322752a391692eb3ba255a2;hp=ef2c53027dfb88f0b941a965b9321695ad02f84b;hb=6039c7f4b0052c4da21520cdd604f04a5a67f50d;hpb=dba19a8f14cefdede3cc7d0f8322fdb9a2c44d50

diff --git a/ubus.c b/ubus.c
index ef2c530..f353d01 100644
--- a/ubus.c
+++ b/ubus.c
@@ -1,7 +1,7 @@
 /*
  * 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
@@ -259,9 +259,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;
 		}
@@ -281,10 +281,12 @@ fw3_ubus_rules(struct blob_buf *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_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);