From d844d3fd03cdafe95d05c22419b2c92bfb582df8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steffen=20F=C3=B6rster?= Date: Mon, 10 Jul 2017 23:08:39 +0200 Subject: [PATCH 1/5] gluon-mesh-batman-adv: enable routing algorithm configuration through site.conf --- package/gluon-mesh-batman-adv/check_site.lua | 1 + .../luasrc/lib/gluon/upgrade/310-gluon-mesh-batman-adv-mesh | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/package/gluon-mesh-batman-adv/check_site.lua b/package/gluon-mesh-batman-adv/check_site.lua index 384b3224..6b642927 100644 --- a/package/gluon-mesh-batman-adv/check_site.lua +++ b/package/gluon-mesh-batman-adv/check_site.lua @@ -1,3 +1,4 @@ if need_table('mesh', nil, false) and need_table('mesh.batman_adv', nil, false) then need_number('mesh.batman_adv.gw_sel_class', false) + need_one_of('mesh.batman_adv.routing_algo', {'BATMAN_IV', 'BATMAN_V'}, false) end diff --git a/package/gluon-mesh-batman-adv/luasrc/lib/gluon/upgrade/310-gluon-mesh-batman-adv-mesh b/package/gluon-mesh-batman-adv/luasrc/lib/gluon/upgrade/310-gluon-mesh-batman-adv-mesh index 8153f075..aee82b24 100755 --- a/package/gluon-mesh-batman-adv/luasrc/lib/gluon/upgrade/310-gluon-mesh-batman-adv-mesh +++ b/package/gluon-mesh-batman-adv/luasrc/lib/gluon/upgrade/310-gluon-mesh-batman-adv-mesh @@ -12,12 +12,18 @@ if site.mesh and site.mesh.batman_adv then gw_sel_class = site.mesh.batman_adv.gw_sel_class end +local routing_algo +if site.mesh and site.mesh.batman_adv then + routing_algo = site.mesh.batman_adv.routing_algo +end + uci:delete('batman-adv', 'bat0') uci:section('batman-adv', 'mesh', 'bat0', { orig_interval = 5000, gw_mode = 'client', gw_sel_class = gw_sel_class, hop_penalty = 15, + routing_algo = routing_algo, multicast_mode = false, }) uci:save('batman-adv') From e2b899637c30e3e1ac58961302aeb95966ec9b85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steffen=20F=C3=B6rster?= Date: Tue, 11 Jul 2017 10:07:19 +0200 Subject: [PATCH 2/5] gluon-mesh-batman-adv: fix indentation --- .../luasrc/lib/gluon/upgrade/310-gluon-mesh-batman-adv-mesh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gluon-mesh-batman-adv/luasrc/lib/gluon/upgrade/310-gluon-mesh-batman-adv-mesh b/package/gluon-mesh-batman-adv/luasrc/lib/gluon/upgrade/310-gluon-mesh-batman-adv-mesh index aee82b24..62657b54 100755 --- a/package/gluon-mesh-batman-adv/luasrc/lib/gluon/upgrade/310-gluon-mesh-batman-adv-mesh +++ b/package/gluon-mesh-batman-adv/luasrc/lib/gluon/upgrade/310-gluon-mesh-batman-adv-mesh @@ -23,7 +23,7 @@ uci:section('batman-adv', 'mesh', 'bat0', { gw_mode = 'client', gw_sel_class = gw_sel_class, hop_penalty = 15, - routing_algo = routing_algo, + routing_algo = routing_algo, multicast_mode = false, }) uci:save('batman-adv') From 874ec0bf9bd7cd925ef4126013422e4f868c9d37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steffen=20F=C3=B6rster?= Date: Mon, 17 Jul 2017 20:47:32 +0200 Subject: [PATCH 3/5] Update 310-gluon-mesh-batman-adv-mesh --- .../luasrc/lib/gluon/upgrade/310-gluon-mesh-batman-adv-mesh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gluon-mesh-batman-adv/luasrc/lib/gluon/upgrade/310-gluon-mesh-batman-adv-mesh b/package/gluon-mesh-batman-adv/luasrc/lib/gluon/upgrade/310-gluon-mesh-batman-adv-mesh index 62657b54..b119531a 100755 --- a/package/gluon-mesh-batman-adv/luasrc/lib/gluon/upgrade/310-gluon-mesh-batman-adv-mesh +++ b/package/gluon-mesh-batman-adv/luasrc/lib/gluon/upgrade/310-gluon-mesh-batman-adv-mesh @@ -23,7 +23,7 @@ uci:section('batman-adv', 'mesh', 'bat0', { gw_mode = 'client', gw_sel_class = gw_sel_class, hop_penalty = 15, - routing_algo = routing_algo, + routing_algo = routing_algo, multicast_mode = false, }) uci:save('batman-adv') From 3ee7631fe255d573163656dfed94aee838e06fb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steffen=20F=C3=B6rster?= Date: Mon, 17 Jul 2017 23:58:00 +0200 Subject: [PATCH 4/5] gluon-mesh-batman-adv: enable routing algorithm configuration added the usage of the config supplied in the uci config --- .../files/lib/netifd/proto/gluon_bat0.sh | 6 ++++++ 1 file changed, 6 insertions(+) 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 781d91c3..be72f155 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 @@ -15,6 +15,12 @@ proto_gluon_bat0_renew() { lock /var/lock/gluon_bat0.lock + local routing_algo="$(uci get batman-adv.bat0.routing_algo)" + + echo "The algo is set to $routing_algo" + + echo $routing_algo > /sys/module/batman_adv/parameters/routing_algo + local ifdump="$(ubus call network.interface dump)" echo "$ifdump" | jsonfilter \ From ccf32fb519ea8a0c6d4d2e74a0ced3005efb8664 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steffen=20F=C3=B6rster?= Date: Tue, 18 Jul 2017 00:06:17 +0200 Subject: [PATCH 5/5] gluon-mesh-batman-adv: enable routing algorithm configuration --- .../files/lib/netifd/proto/gluon_bat0.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 be72f155..6e9034b6 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 @@ -14,12 +14,12 @@ proto_gluon_bat0_renew() { local config="$1" lock /var/lock/gluon_bat0.lock - - local routing_algo="$(uci get batman-adv.bat0.routing_algo)" - - echo "The algo is set to $routing_algo" - - echo $routing_algo > /sys/module/batman_adv/parameters/routing_algo + + local routing_algo="$(uci get batman-adv.bat0.routing_algo)" + + echo "The algo is set to $routing_algo" + + echo $routing_algo > /sys/module/batman_adv/parameters/routing_algo local ifdump="$(ubus call network.interface dump)"