From 53ae15fdbe09e48c1f6f8acd5548ec43b0ebf644 Mon Sep 17 00:00:00 2001
From: Christof Schulze <christof.schulze@gmx.net>
Date: Thu, 22 Jun 2017 23:13:44 +0200
Subject: [PATCH 1/2] gluon-core: gluon_mesh.sh: whitespace cleanup

---
 .../gluon-core/files/lib/netifd/proto/gluon_mesh.sh   | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/package/gluon-core/files/lib/netifd/proto/gluon_mesh.sh b/package/gluon-core/files/lib/netifd/proto/gluon_mesh.sh
index e84e057c..6f878d3d 100755
--- a/package/gluon-core/files/lib/netifd/proto/gluon_mesh.sh
+++ b/package/gluon-core/files/lib/netifd/proto/gluon_mesh.sh
@@ -20,20 +20,19 @@ proto_gluon_mesh_setup() {
 	export TRANSITIVE="${transitive:-0}"
 
 	for script in /lib/gluon/core/mesh/setup.d/*; do
-	        [ ! -x "$script" ] || "$script"
+		[ ! -x "$script" ] || "$script"
 	done
 
-        proto_init_update "$IFNAME" 1
+	proto_init_update "$IFNAME" 1
 
 	proto_add_data
 	json_add_boolean fixed_mtu "$FIXED_MTU"
 	json_add_boolean transitive "$TRANSITIVE"
 	proto_close_data
-
-        proto_send_update "$CONFIG"
+	proto_send_update "$CONFIG"
 
 	for script in /lib/gluon/core/mesh/post-setup.d/*; do
-	        [ ! -x "$script" ] || "$script"
+		[ ! -x "$script" ] || "$script"
 	done
 }
 
@@ -42,7 +41,7 @@ proto_gluon_mesh_teardown() {
 	export IFNAME="$2"
 
 	for script in /lib/gluon/core/mesh/teardown.d/*; do
-	        [ ! -x "$script" ] || "$script"
+		[ ! -x "$script" ] || "$script"
 	done
 }
 

From 511213a214e621b2d5a39854574c62b3a672f9e3 Mon Sep 17 00:00:00 2001
From: Christof Schulze <christof.schulze@gmx.net>
Date: Thu, 22 Jun 2017 23:14:48 +0200
Subject: [PATCH 2/2] gluon-core: add interfaces having proto = gluon_mesh to
 mesh firewall zone

---
 .../gluon-core/files/lib/netifd/proto/gluon_mesh.sh  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/package/gluon-core/files/lib/netifd/proto/gluon_mesh.sh b/package/gluon-core/files/lib/netifd/proto/gluon_mesh.sh
index 6f878d3d..ef763a49 100755
--- a/package/gluon-core/files/lib/netifd/proto/gluon_mesh.sh
+++ b/package/gluon-core/files/lib/netifd/proto/gluon_mesh.sh
@@ -25,10 +25,14 @@ proto_gluon_mesh_setup() {
 
 	proto_init_update "$IFNAME" 1
 
-	proto_add_data
-	json_add_boolean fixed_mtu "$FIXED_MTU"
-	json_add_boolean transitive "$TRANSITIVE"
-	proto_close_data
+	if [ "$IFNAME" != "br-wan" ]
+	then
+		proto_add_data
+		json_add_string zone mesh
+		json_add_boolean fixed_mtu "$FIXED_MTU"
+		json_add_boolean transitive "$TRANSITIVE"
+		proto_close_data
+	fi
 	proto_send_update "$CONFIG"
 
 	for script in /lib/gluon/core/mesh/post-setup.d/*; do