openwrt-feed-batman-adv: Allow to select routing algorithm

Message ID 1453204027-10948-1-git-send-email-sven@open-mesh.com (mailing list archive)
State Accepted, archived
Headers

Commit Message

Sven Eckelmann Jan. 19, 2016, 11:47 a.m. UTC
  The network config section for proto batadv now allows to select the
routing algorithm via the option routing_algo. This allows to chose between
BATMAN_IV and BATMAN_V when BATMAN_V is released. This option is only
useful when a new batman-adv device is created and not when only a device
is added to an already existing batman-adv device.

Signed-off-by: Sven Eckelmann <sven@open-mesh.com>
---
 batman-adv-devel/files/lib/netifd/proto/batadv.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
  

Comments

Marek Lindner Jan. 30, 2016, 7:11 a.m. UTC | #1
On Tuesday, January 19, 2016 12:47:07 Sven Eckelmann wrote:
> The network config section for proto batadv now allows to select the
> routing algorithm via the option routing_algo. This allows to chose between
> BATMAN_IV and BATMAN_V when BATMAN_V is released. This option is only
> useful when a new batman-adv device is created and not when only a device
> is added to an already existing batman-adv device.
> 
> Signed-off-by: Sven Eckelmann <sven@open-mesh.com>
> ---
>  batman-adv-devel/files/lib/netifd/proto/batadv.sh | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)

Applied in revision 3dafbb1.

Thanks,
Marek
  

Patch

diff --git a/batman-adv-devel/files/lib/netifd/proto/batadv.sh b/batman-adv-devel/files/lib/netifd/proto/batadv.sh
index 632a209..1e0c9d0 100644
--- a/batman-adv-devel/files/lib/netifd/proto/batadv.sh
+++ b/batman-adv-devel/files/lib/netifd/proto/batadv.sh
@@ -6,14 +6,18 @@  init_proto "$@"
 
 proto_batadv_init_config() {
 	proto_config_add_string "mesh"
+	proto_config_add_string "routing_algo"
 }
 
 proto_batadv_setup() {
 	local config="$1"
 	local iface="$2"
 
-	local mesh
-	json_get_vars mesh
+	local mesh routing_algo
+	json_get_vars mesh routing_algo
+
+	[ -n "$routing_algo" ] || routing_algo="BATMAN_IV"
+	echo "$routing_algo" > "/sys/module/batman_adv/parameters/routing_algo"
 
 	echo "$mesh" > "/sys/class/net/$iface/batman_adv/mesh_iface"
 	proto_init_update "$iface" 1