add babeld_over_batman option

libremesh · Nov 1, 2019 · a8369d9 · a8369d9
1 parent 3624b2c
commit a8369d9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/packages/lime-docs/files/lime-example b/packages/lime-docs/files/lime-example
@@ -51,6 +51,7 @@ config lime network
 	option bmx7_over_batman false
 	option bmx7_pref_gw none			# Force bmx7 to use a specific gateway to Internet (hostname must be used as identifier)
 	option bmx7_wifi_rate_max 'auto'
+	option babeld_over_batman false			# When Babeld is run without VLAN (babeld:0), it runs on the bridge which includes Batman-adv's bat0, keeping this false avoids to have Babeld seeing all the nodes as direct neighbors due to Batman-adv. Set it to true just if Babeld is active only on a few border nodes.
 	option anygw_mac 'aa:aa:aa:%N1:%N2:aa'		# Parametrizable with %Nn. Keep in mind that the ebtables rule will use a mask of ff:ff:ff:00:00:00 so br-lan will not forward anything coming in that matches the first 3 bytes of it's own anygw_mac (aa:aa:aa: by default)
 #	option autoap_enabled 0				# Requires lime-ap-watchping installed. If enabled AP SSID is changed to ERROR when network issues
 #	option autoap_hosts "8.8.8.8 141.1.1.1"		# Requires lime-ap-watchping installed. Hosts used to check if the network is working fine

diff --git a/packages/lime-proto-babeld/files/usr/lib/lua/lime/proto/babeld.lua b/packages/lime-proto-babeld/files/usr/lib/lua/lime/proto/babeld.lua
@@ -92,7 +92,8 @@ function babeld.configure(args)
 	--! If Babeld's Hello packets run over Batman-adv (whose bat0 is also
 	--! included in br-lan), all the Babeld nodes would appear as being direct
 	--! neighbors, so these Hello packets on bat0 have to be filtered
-	if utils.is_installed("kmod-batman-adv") then
+	local babeldOverBatman = config.get_bool("network", "babeld_over_batman")
+	if utils.is_installed("kmod-batman-adv") and not babeldOverBatman then
 		fs.mkdir("/etc/firewall.lime.d")
 		fs.writefile("/etc/firewall.lime.d/21-babeld-not-over-bat0-ebtables",
 		  "ebtables -t nat -A POSTROUTING -o bat0 -p ipv6"..

diff --git a/packages/lime-system/files/etc/config/lime-defaults-factory b/packages/lime-system/files/etc/config/lime-defaults-factory
@@ -39,6 +39,7 @@ config lime network
 	option bmx7_over_batman false
 	option bmx7_pref_gw none
 	option bmx7_wifi_rate_max 'auto'
+	option babeld_over_batman false
 	option anygw_mac "aa:aa:aa:%N1:%N2:aa"
 	option use_odhcpd false