aboutsummaryrefslogtreecommitdiffstats
path: root/package/network
diff options
context:
space:
mode:
authorHans Dedecker <dedeckeh@gmail.com>2017-03-14 22:39:43 +0100
committerHans Dedecker <dedeckeh@gmail.com>2017-03-21 22:59:08 +0100
commit071355dd5c2e024659f0bc623f907c745dfc8837 (patch)
treec1e15ac0577bd7edce9b5061b3b5cba2242c582f /package/network
parent3a5bacdc7dfb0a34074f0ac93d9bc90e94ba2b71 (diff)
downloadupstream-071355dd5c2e024659f0bc623f907c745dfc8837.tar.gz
upstream-071355dd5c2e024659f0bc623f907c745dfc8837.tar.bz2
upstream-071355dd5c2e024659f0bc623f907c745dfc8837.zip
vti: add vti specific settings as nested json object
Add vti specific settings ikey and okey as a nested data json object Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
Diffstat (limited to 'package/network')
-rw-r--r--package/network/config/vti/Makefile2
-rwxr-xr-xpackage/network/config/vti/files/vti.sh7
2 files changed, 7 insertions, 2 deletions
diff --git a/package/network/config/vti/Makefile b/package/network/config/vti/Makefile
index bda2a9ab17..0a4657c94e 100644
--- a/package/network/config/vti/Makefile
+++ b/package/network/config/vti/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=vti
PKG_VERSION:=1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_LICENSE:=GPL-2.0
include $(INCLUDE_DIR)/package.mk
diff --git a/package/network/config/vti/files/vti.sh b/package/network/config/vti/files/vti.sh
index 763fd4ee32..0443800a0c 100755
--- a/package/network/config/vti/files/vti.sh
+++ b/package/network/config/vti/files/vti.sh
@@ -26,7 +26,12 @@ vti_generic_setup() {
json_add_string local "$local"
json_add_string remote "$remote"
[ -n "$tunlink" ] && json_add_string link "$tunlink"
- json_add_string info "${ikey:-0},${okey:-0}"
+
+ json_add_object 'data'
+ [ -n "$ikey" ] && json_add_int ikey "$ikey"
+ [ -n "$okey" ] && json_add_int okey "$okey"
+ json_close_object
+
proto_close_tunnel
proto_add_data