OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 72... Line 72...
72 proto_config_add_boolean keepalive_adaptive 72 proto_config_add_boolean keepalive_adaptive
73 proto_config_add_int demand 73 proto_config_add_int demand
74 proto_config_add_string pppd_options 74 proto_config_add_string pppd_options
75 proto_config_add_string 'connect:file' 75 proto_config_add_string 'connect:file'
76 proto_config_add_string 'disconnect:file' 76 proto_config_add_string 'disconnect:file'
77 [ -e /proc/sys/net/ipv6 ] && proto_config_add_string ipv6 77 proto_config_add_string ipv6
78 proto_config_add_boolean authfail 78 proto_config_add_boolean authfail
79 proto_config_add_int mtu 79 proto_config_add_int mtu
80 proto_config_add_string pppname 80 proto_config_add_string pppname
81 proto_config_add_string unnumbered 81 proto_config_add_string unnumbered
82 proto_config_add_boolean persist 82 proto_config_add_boolean persist
Line 86... Line 86...
86   86  
87 ppp_generic_setup() { 87 ppp_generic_setup() {
88 local config="$1"; shift 88 local config="$1"; shift
Line 89... Line 89...
89 local localip 89 local localip
90   -  
91 json_get_vars ip6table demand keepalive keepalive_adaptive username password pppd_options pppname unnumbered persist maxfail holdoff peerdns -  
92   -  
93 [ ! -e /proc/sys/net/ipv6 ] && ipv6=0 || json_get_var ipv6 ipv6 90  
94   91 json_get_vars ipv6 ip6table demand keepalive keepalive_adaptive username password pppd_options pppname unnumbered persist maxfail holdoff peerdns
95 if [ "$ipv6" = 0 ]; then 92 if [ "$ipv6" = 0 ]; then
96 ipv6="" 93 ipv6=""
97 elif [ -z "$ipv6" -o "$ipv6" = auto ]; then 94 elif [ -z "$ipv6" -o "$ipv6" = auto ]; then
Line 121... Line 118...
121 proto_block_restart "$config" 118 proto_block_restart "$config"
122 return 119 return
123 } 120 }
124 } 121 }
Line 125... Line -...
125   -  
126 [ -n "$keepalive" ] || keepalive="5 1" -  
127   122  
128 local lcp_failure="${keepalive%%[, ]*}" 123 local lcp_failure="${keepalive%%[, ]*}"
129 local lcp_interval="${keepalive##*[, ]}" 124 local lcp_interval="${keepalive##*[, ]}"
130 local lcp_adaptive="lcp-echo-adaptive" 125 local lcp_adaptive="lcp-echo-adaptive"
131 [ "${lcp_failure:-0}" -lt 1 ] && lcp_failure="" 126 [ "${lcp_failure:-0}" -lt 1 ] && lcp_failure=""
Line 149... Line 144...
149 ${holdoff:+holdoff "$holdoff"} \ 144 ${holdoff:+holdoff "$holdoff"} \
150 ${username:+user "$username" password "$password"} \ 145 ${username:+user "$username" password "$password"} \
151 ${connect:+connect "$connect"} \ 146 ${connect:+connect "$connect"} \
152 ${disconnect:+disconnect "$disconnect"} \ 147 ${disconnect:+disconnect "$disconnect"} \
153 ip-up-script /lib/netifd/ppp-up \ 148 ip-up-script /lib/netifd/ppp-up \
154 ${ipv6:+ipv6-up-script /lib/netifd/ppp6-up} \ 149 ipv6-up-script /lib/netifd/ppp6-up \
155 ip-down-script /lib/netifd/ppp-down \ 150 ip-down-script /lib/netifd/ppp-down \
156 ${ipv6:+ipv6-down-script /lib/netifd/ppp-down} \ 151 ipv6-down-script /lib/netifd/ppp-down \
157 ${mtu:+mtu $mtu mru $mtu} \ 152 ${mtu:+mtu $mtu mru $mtu} \
158 "$@" $pppd_options 153 "$@" $pppd_options
159 } 154 }
Line 160... Line 155...
160   155