allow to define a list of mesh interfaces (ffdd.sys.bmxd_mesh_if)

CHANGELOG.md

@@ -6,16 +6,18 @@
 In the current version the configuration management changes from `nvram` (*/etc/nvram.conf*) to `uci` (*/etc/config/ffdd*)!
 *You can find a complete example configuration in [/etc/config/ffdd_sample](https://github.com/Freifunk-Dresden/ffdd-server/blob/master/salt/freifunk/base/uci/etc/config/ffdd).*
 
+The current nvram.conf will be migrated automatically to uci.
+
 This update is not carried out automatically and must be done manually be performed.
 use: `bash -c "$(wget http://2ffd.de/ffdd-server_manuell_update -O -)"` or `freifunk-manuell_update.sh`
 
-The current nvram.conf will be migrated automatically.
-
 we also update devel commands in the `init_server.sh` - please see [readme.md](https://github.com/Freifunk-Dresden/ffdd-server#development) part.
 
 	- add uci config management
 		- change nvram to uci
-	- change bmxd from manuell build to package installation
+	- bmxd:
+		- change from manuell build to package installation
+		- allow to define a list of mesh interfaces (ffdd.sys.bmxd_mesh_if)
 	- fastd:
 		- add white/blacklists for better connection control
 		- fix `add_connect`

salt/freifunk/base/bmxd/etc/init.d/S52batmand

@@ -51,15 +51,22 @@ fi
 # 127er IP would be broadcasted
 PRIMARY_IF="bmx_prime"
 FASTD_IF="tbb_fastd2"
+MESH_IF=("$(uci -qX get ffdd.sys.bmxd_mesh_if)")
 if [ "$1" = "start" ]; then
 	#ip link add link lo name "$PRIMARY_IF" type bridge
 	ip tuntap add dev "$PRIMARY_IF" mod tun
 	ip addr add "$_ddmesh_ip"/"$_ddmesh_netpre" broadcast "$_ddmesh_broadcast" dev "$PRIMARY_IF"
 	ip link set dev "$PRIMARY_IF" up
 fi
-
 _IF="dev=$PRIMARY_IF /linklayer 0 dev=$FASTD_IF /linklayer 1"
 
+if [ -n "$MESH_IF" ] && [ "$MESH_IF" != '-' ]; then
+	for M_IF in "${MESH_IF[@]}"; do
+		_IF="$_IF dev=$M_IF /linklayer 1"
+	done
+fi
+
+
 # default start with no gatway.will be updated by gateway_check.sh
 SPECIAL_OPTS='--throw-rules 0 --prio-rules 0'
 #TUNNEL_OPTS='--one-way-tunnel 1 --two-way-tunnel 2'

salt/freifunk/base/uci/etc/config/ffdd

@@ -46,6 +46,7 @@ config 'ffdd' 'sys'
 
 	# BMXD
 	option 'bmxd_prefered_gateway' '-'
+	list 'bmxd_mesh_if' '-'
 
 	# gps coordinates. see /var/www/sysinfo.json
 	# this functionality is not part of Basic Vserver installation, as this service should only run on one or an backup server.