projects
/
openwrt
/
svn-archive
/
archive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add pppd options patch from #2114
[openwrt/svn-archive/archive.git]
/
package
/
ppp
/
files
/
ppp.sh
diff --git
a/package/ppp/files/ppp.sh
b/package/ppp/files/ppp.sh
index abc022741aa9710e982b1e247cf12b05e3423e39..507f453fcd116fa23819eeec144348e124f68d24 100644
(file)
--- a/
package/ppp/files/ppp.sh
+++ b/
package/ppp/files/ppp.sh
@@
-21,20
+21,42
@@
start_pppd() {
config_get username "$cfg" username
config_get password "$cfg" password
config_get keepalive "$cfg" keepalive
config_get username "$cfg" username
config_get password "$cfg" password
config_get keepalive "$cfg" keepalive
- interval="${keepalive%%*[, ]}"
+
+ config_get connect "$cfg" connect
+ config_get disconnect "$cfg" disconnect
+ config_get pppd_options "$cfg" pppd_options
+
+ interval="${keepalive##*[, ]}"
[ "$interval" != "$keepalive" ] || interval=5
config_get demand "$cfg" demand
[ "$interval" != "$keepalive" ] || interval=5
config_get demand "$cfg" demand
- [ -n "$demand" ] && echo "nameserver 1.1.1.1" > /tmp/resolv.conf
+ [ -n "$demand" ] && echo "nameserver 1.1.1.1" > /tmp/resolv.conf
.auto
/usr/sbin/pppd "$@" \
/usr/sbin/pppd "$@" \
- ${keepalive:+lcp-echo-interval $interval lcp-echo-failure ${keepalive
##
[, ]*}} \
+ ${keepalive:+lcp-echo-interval $interval lcp-echo-failure ${keepalive
%%
[, ]*}} \
${demand:+precompiled-active-filter /etc/ppp/filter demand idle }${demand:-persist} \
usepeerdns \
defaultroute \
replacedefaultroute \
${username:+user "$username" password "$password"} \
linkname "$cfg" \
${demand:+precompiled-active-filter /etc/ppp/filter demand idle }${demand:-persist} \
usepeerdns \
defaultroute \
replacedefaultroute \
${username:+user "$username" password "$password"} \
linkname "$cfg" \
- ipparam "$cfg"
+ ipparam "$cfg" \
+ ${connect:+connect "$connect"} \
+ ${disconnect:+disconnect "$disconnect"} \
+ ${pppd_options}
lock -u "/var/lock/ppp-${cfg}"
}
lock -u "/var/lock/ppp-${cfg}"
}
+
+setup_interface_ppp() {
+ local iface="$1"
+ local config="$2"
+
+ config_get device "$config" device
+
+ config_get mtu "$cfg" mtu
+ mtu=${mtu:-1492}
+ start_pppd "$config" \
+ mtu $mtu mru $mtu \
+ "$device"
+}
+