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 <[email protected]>

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

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