projects
/
openwrt
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tools/ccache: update to 3.6
[openwrt/.git]
/
package
/
network
/
config
/
vti
/
files
/
vti.sh
diff --git
a/package/network/config/vti/files/vti.sh
b/package/network/config/vti/files/vti.sh
index 763fd4ee320ac6fea07cf9fac1037a6e8375e67e..ebfd9d41e1466542a079f4c4d7adf26f3395e636 100755
(executable)
--- a/
package/network/config/vti/files/vti.sh
+++ b/
package/network/config/vti/files/vti.sh
@@
-16,8
+16,6
@@
vti_generic_setup() {
local mtu zone ikey
json_get_vars mtu zone ikey okey
local mtu zone ikey
json_get_vars mtu zone ikey okey
- [ -z "$zone" ] && zone="wan"
-
proto_init_update "$link" 1
proto_add_tunnel
proto_init_update "$link" 1
proto_add_tunnel
@@
-26,7
+24,12
@@
vti_generic_setup() {
json_add_string local "$local"
json_add_string remote "$remote"
[ -n "$tunlink" ] && json_add_string link "$tunlink"
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
proto_close_tunnel
proto_add_data