From: Hans Dedecker Date: Thu, 18 May 2017 09:34:44 +0000 (+0200) Subject: 6rd: add 6rd specific settings as nested json object X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=c0a9a7339364c2baa6fb4a3d594b786591e05fb8;p=openwrt%2Fstaging%2Fblogic.git 6rd: add 6rd specific settings as nested json object Add 6rd specific settings prefix, relay-prefix as a nested data json object Signed-off-by: Hans Dedecker --- diff --git a/package/network/ipv6/6rd/Makefile b/package/network/ipv6/6rd/Makefile index 899c0f13f218..5086fae69d29 100644 --- a/package/network/ipv6/6rd/Makefile +++ b/package/network/ipv6/6rd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=6rd PKG_VERSION:=9 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_LICENSE:=GPL-2.0 include $(INCLUDE_DIR)/package.mk diff --git a/package/network/ipv6/6rd/files/6rd.sh b/package/network/ipv6/6rd/files/6rd.sh index 62d35b699466..8b34414280fb 100644 --- a/package/network/ipv6/6rd/files/6rd.sh +++ b/package/network/ipv6/6rd/files/6rd.sh @@ -64,9 +64,13 @@ proto_6rd_setup() { json_add_int ttl "${ttl:-64}" [ -n "$tos" ] && json_add_string tos "$tos" json_add_string local "$ipaddr" - json_add_string 6rd-prefix "$ip6prefix/$ip6prefixlen" - json_add_string 6rd-relay-prefix "$ip4prefix/$ip4prefixlen" [ -n "$tunlink" ] && json_add_string link "$tunlink" + + json_add_object 'data' + json_add_string prefix "$ip6prefix/$ip6prefixlen" + json_add_string relay-prefix "$ip4prefix/$ip4prefixlen" + json_close_object + proto_close_tunnel proto_add_data