From 08334d86dc8a133811bf0726f0702604c5e4322d Mon Sep 17 00:00:00 2001 From: Grady Johnson Date: Wed, 13 Aug 2014 16:03:11 -0400 Subject: [PATCH 1/2] adding routing option to profile schema --- src/daemon.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/daemon.c b/src/daemon.c index bed7315..eafa4cf 100644 --- a/src/daemon.c +++ b/src/daemon.c @@ -86,7 +86,8 @@ SCHEMA(default) SCHEMA_ADD("encryption", "psk2"); SCHEMA_ADD("key", "c0MM0t10n!r0cks"); SCHEMA_ADD("serval", "false"); - SCHEMA_ADD("announce", "true"); + SCHEMA_ADD("announce", "true"); + SCHEMA_ADD("routing", "olsr"); return 1; } From 70860f530b063970a18182f4e2c5af7624d53a57 Mon Sep 17 00:00:00 2001 From: Grady Johnson Date: Fri, 15 Aug 2014 15:11:33 -0400 Subject: [PATCH 2/2] added 'commotion_get_routing' function --- openwrt/lib/functions/commotion.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/openwrt/lib/functions/commotion.sh b/openwrt/lib/functions/commotion.sh index c421a2e..1d317e6 100644 --- a/openwrt/lib/functions/commotion.sh +++ b/openwrt/lib/functions/commotion.sh @@ -300,6 +300,22 @@ commotion_get_serval() { return "$ret" } +commotion_get_routing() { + local iface="$1" + local data= + + data="$($CLIENT -b $SOCKET state "$iface" routing 2>/dev/null)" + [[ -z "$data" -o "$?" != 0 ]] || echo "$data" | grep -qs "Failed*" && return 1 + ret=$? + + # UPDATE for routing + json_load "$data" + json_get_var rt routing + echo "$rt" + return "$ret" +} + + commotion_get_mode() { local iface="$1" local data=