6rd: add 6rd specific settings as nested json object

[openwrt/staging/mkresin.git] / package / network / ipv6 / 6rd / files / 6rd.sh

diff --git a/package/network/ipv6/6rd/files/6rd.sh b/package/network/ipv6/6rd/files/6rd.sh
index 62d35b699466a6cad4123c8c130fcb7db2b944a6..8b34414280fbd0e020b15fc984155f0e42e5cd6e 100644 (file)
--- 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