From: Hans Dedecker <dedeckeh@gmail.com>
Date: Thu, 13 Apr 2017 13:49:04 +0000 (+0200)
Subject: ubus: fix interface name and proto lookup
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=commitdiff_plain;h=1d0564c3558a115d90fe266e668221135bcb3221

ubus: fix interface name and proto lookup

Lookup of iface_name and iface_proto in the json data were switched
in fw3_ubus_rules

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
---

diff --git a/ubus.c b/ubus.c
index e5326f9..f353d01 100644
--- a/ubus.c
+++ b/ubus.c
@@ -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;
 		}