From 88d4c338900b823f178b492225a0f22617969f3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
Date: Tue, 27 Nov 2018 04:21:02 +0100
Subject: [PATCH] gluon-mesh-batman-adv: Adapt scripts to new batman-adv-legacy
 namespace
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
---
 package/gluon-mesh-batman-adv/check_site.lua  |  2 +-
 .../mesh/teardown.d/70-gluon-mesh-batman-adv  |  1 +
 .../files/lib/netifd/proto/gluon_bat0.sh      | 20 ++++++++++++++-----
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/package/gluon-mesh-batman-adv/check_site.lua b/package/gluon-mesh-batman-adv/check_site.lua
index f5ea9fb4..a3786a96 100644
--- a/package/gluon-mesh-batman-adv/check_site.lua
+++ b/package/gluon-mesh-batman-adv/check_site.lua
@@ -2,4 +2,4 @@
 need_boolean(in_domain({'mesh', 'vxlan'}), not this_domain())
 
 need_number({'mesh', 'batman_adv', 'gw_sel_class'}, false)
-need_one_of({'mesh', 'batman_adv', 'routing_algo'}, {'BATMAN_IV', 'BATMAN_V'}, false)
+need_one_of({'mesh', 'batman_adv', 'routing_algo'}, {'BATMAN_IV', 'BATMAN_IV_LEGACY', 'BATMAN_V'}, false)
diff --git a/package/gluon-mesh-batman-adv/files/lib/gluon/core/mesh/teardown.d/70-gluon-mesh-batman-adv b/package/gluon-mesh-batman-adv/files/lib/gluon/core/mesh/teardown.d/70-gluon-mesh-batman-adv
index 355b89b0..a035e828 100755
--- a/package/gluon-mesh-batman-adv/files/lib/gluon/core/mesh/teardown.d/70-gluon-mesh-batman-adv
+++ b/package/gluon-mesh-batman-adv/files/lib/gluon/core/mesh/teardown.d/70-gluon-mesh-batman-adv
@@ -2,4 +2,5 @@
 
 lock /var/lock/gluon_bat0.lock
 (echo 'none' > "/sys/class/net/$IFNAME/batman_adv/mesh_iface") 2>/dev/null
+(echo 'none' > "/sys/class/net/$IFNAME/batman_adv_legacy/mesh_iface") 2>/dev/null
 lock -u /var/lock/gluon_bat0.lock
diff --git a/package/gluon-mesh-batman-adv/files/lib/netifd/proto/gluon_bat0.sh b/package/gluon-mesh-batman-adv/files/lib/netifd/proto/gluon_bat0.sh
index ea562c49..acf97e63 100755
--- a/package/gluon-mesh-batman-adv/files/lib/netifd/proto/gluon_bat0.sh
+++ b/package/gluon-mesh-batman-adv/files/lib/netifd/proto/gluon_bat0.sh
@@ -16,18 +16,23 @@ proto_gluon_bat0_renew() {
 	lock /var/lock/gluon_bat0.lock
 
 	local ifdump="$(ubus call network.interface dump)"
+	local routing_algo="$(uci -q get batman-adv.bat0.routing_algo || echo 'BATMAN_IV')"
 
 	echo "$ifdump" | jsonfilter \
 		-e "@.interface[@.proto='gluon_mesh' && @.up=true]['device','data']" \
 	| while read dev; do
 		read data
 
-		echo bat0 > "/sys/class/net/$dev/batman_adv/mesh_iface"
-
 		! [ "$(echo "$data" | jsonfilter -e "@.transitive")" = 'true' ]
 		transitive=$?
 
-		(echo "$transitive" > "/sys/class/net/$dev/batman_adv/no_rebroadcast") 2>/dev/null
+		if [ "$routing_algo" = "BATMAN_IV_LEGACY" ]; then
+			echo bat0 > "/sys/class/net/$dev/batman_adv_legacy/mesh_iface"
+			(echo "$transitive" > "/sys/class/net/$dev/batman_adv_legacy/no_rebroadcast") 2>/dev/null
+		else
+			echo bat0 > "/sys/class/net/$dev/batman_adv/mesh_iface"
+			(echo "$transitive" > "/sys/class/net/$dev/batman_adv/no_rebroadcast") 2>/dev/null
+		fi
 	done
 
 	lock -u /var/lock/gluon_bat0.lock
@@ -43,9 +48,14 @@ proto_gluon_bat0_setup() {
 	ip link set primary0 address "$primary0_mac" mtu 1532 up
 
 	local routing_algo="$(uci -q get batman-adv.bat0.routing_algo || echo 'BATMAN_IV')"
-	(echo "$routing_algo" >/sys/module/batman_adv/parameters/routing_algo) 2>/dev/null
 
-	echo bat0 > /sys/class/net/primary0/batman_adv/mesh_iface
+	if [ "$routing_algo" = "BATMAN_IV_LEGACY" ]; then
+		(echo "BATMAN_IV" >/sys/module/batman_adv_legacy/parameters/routing_algo) 2>/dev/null
+		echo bat0 > /sys/class/net/primary0/batman_adv_legacy/mesh_iface
+	else
+		(echo "$routing_algo" >/sys/module/batman_adv/parameters/routing_algo) 2>/dev/null
+		echo bat0 > /sys/class/net/primary0/batman_adv/mesh_iface
+	fi
 
 	proto_init_update primary0 1
 	proto_send_update "$config"