OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 14... Line 14...
14 local remote="$4" 14 local remote="$4"
15 local link="$5" 15 local link="$5"
16 local mtu ttl tos zone ikey okey icsum ocsum iseqno oseqno multicast 16 local mtu ttl tos zone ikey okey icsum ocsum iseqno oseqno multicast
17 json_get_vars mtu ttl tos zone ikey okey icsum ocsum iseqno oseqno multicast 17 json_get_vars mtu ttl tos zone ikey okey icsum ocsum iseqno oseqno multicast
Line -... Line 18...
-   18  
18   19 [ -z "$zone" ] && zone="wan"
Line 19... Line 20...
19 [ -z "$multicast" ] && multicast=1 20 [ -z "$multicast" ] && multicast=1
Line 20... Line 21...
20   21  
Line 36... Line 37...
36 [ -n "$okey" ] && json_add_int okey "$okey" 37 [ -n "$okey" ] && json_add_int okey "$okey"
37 [ -n "$icsum" ] && json_add_boolean icsum "$icsum" 38 [ -n "$icsum" ] && json_add_boolean icsum "$icsum"
38 [ -n "$ocsum" ] && json_add_boolean ocsum "$ocsum" 39 [ -n "$ocsum" ] && json_add_boolean ocsum "$ocsum"
39 [ -n "$iseqno" ] && json_add_boolean iseqno "$iseqno" 40 [ -n "$iseqno" ] && json_add_boolean iseqno "$iseqno"
40 [ -n "$oseqno" ] && json_add_boolean oseqno "$oseqno" 41 [ -n "$oseqno" ] && json_add_boolean oseqno "$oseqno"
41 [ -n "$encaplimit" ] && json_add_string encaplimit "$encaplimit" -  
42 json_close_object 42 json_close_object
Line 43... Line 43...
43   43  
Line 44... Line 44...
44 proto_close_tunnel 44 proto_close_tunnel
Line 131... Line 131...
131 local cfg="$1" 131 local cfg="$1"
132 local mode="$2" 132 local mode="$2"
133 local remoteip6 133 local remoteip6
Line 134... Line 134...
134   134  
135 local ip6addr peer6addr weakif 135 local ip6addr peer6addr weakif
Line 136... Line 136...
136 json_get_vars ip6addr peer6addr tunlink weakif encaplimit 136 json_get_vars ip6addr peer6addr tunlink weakif
137   137  
138 [ -z "$peer6addr" ] && { 138 [ -z "$peer6addr" ] && {
139 proto_notify_error "$cfg" "MISSING_PEER_ADDRESS" 139 proto_notify_error "$cfg" "MISSING_PEER_ADDRESS"
Line 272... Line 272...
272 proto_grev6_init_config() { 272 proto_grev6_init_config() {
273 gre_generic_init_config 273 gre_generic_init_config
274 proto_config_add_string "ip6addr" 274 proto_config_add_string "ip6addr"
275 proto_config_add_string "peer6addr" 275 proto_config_add_string "peer6addr"
276 proto_config_add_string "weakif" 276 proto_config_add_string "weakif"
277 proto_config_add_string "encaplimit" -  
278 } 277 }
Line 279... Line 278...
279   278  
280 proto_grev6tap_init_config() { 279 proto_grev6tap_init_config() {
281 proto_grev6_init_config 280 proto_grev6_init_config