v1.5 branch refresh based upon upstream master @ c8677ca89e53e3be7988d54280fce166cc894a7e

[librecmc/librecmc.git] / package / network / config / gre / files / gre.sh

diff --git a/package/network/config/gre/files/gre.sh b/package/network/config/gre/files/gre.sh
index 3301cee0057e38c4bfdd6b52272f6c31cb4b66c0..e604bfb259a990ad0cfe587449d0c67d8467b0fd 100755 (executable)
--- a/package/network/config/gre/files/gre.sh
+++ b/package/network/config/gre/files/gre.sh
@@ -31,7 +31,16 @@ gre_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},${icsum:-0},${ocsum:-0},${iseqno:-0},${oseqno:-0}"
+
+       json_add_object 'data'
+       [ -n "$ikey" ] && json_add_int ikey "$ikey"
+       [ -n "$okey" ] && json_add_int okey "$okey"
+       [ -n "$icsum" ] && json_add_boolean icsum "$icsum"
+       [ -n "$ocsum" ] && json_add_boolean ocsum "$ocsum"
+       [ -n "$iseqno" ] && json_add_boolean iseqno "$iseqno"
+       [ -n "$oseqno" ] && json_add_boolean oseqno "$oseqno"
+       json_close_object
+
        proto_close_tunnel
 
        proto_add_data