projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ath9k: fix a few remaining issues in the xmit queue cleanup patch - reduces packet...
[openwrt.git]
/
package
/
ppp
/
files
/
ppp.sh
diff --git
a/package/ppp/files/ppp.sh
b/package/ppp/files/ppp.sh
index bc18d1ec9aee94df768c76b0213c19c849184abd..996d542280cd1d8ea59ac4f55951e8ca97fceaea 100644
(file)
--- a/
package/ppp/files/ppp.sh
+++ b/
package/ppp/files/ppp.sh
@@
-4,14
+4,13
@@
stop_interface_ppp() {
local proto
config_get proto "$cfg" proto
local proto
config_get proto "$cfg" proto
- local
ifname
- config_get ifname "$cfg" ifname
+ local
link="$proto-$cfg"
+ service_kill pppd "/var/run/ppp-${link}.pid"
- local link="${proto:-ppp}-$ifname"
- [ -f "/var/run/ppp-${link}.pid" ] && {
- local pid="$(head -n1 /var/run/ppp-${link}.pid 2>/dev/null)"
- grep -qs pppd "/proc/$pid/cmdline" && kill -TERM $pid
- }
+ remove_dns "$cfg"
+
+ local lock="/var/lock/ppp-$link"
+ [ -f "$lock" ] && lock -u "$lock"
}
start_pppd() {
}
start_pppd() {
@@
-77,27
+76,20
@@
start_pppd() {
local peerdns
config_get_bool peerdns "$cfg" peerdns $peer_default
local peerdns
config_get_bool peerdns "$cfg" peerdns $peer_default
- if [ "$peerdns" -eq 1 ] || [ ! -e /tmp/resolv.conf.auto ]; then
- echo -n "" > /tmp/resolv.conf.auto
- fi
-
[ "$peerdns" -eq 1 ] && {
peerdns="usepeerdns"
} || {
peerdns=""
[ "$peerdns" -eq 1 ] && {
peerdns="usepeerdns"
} || {
peerdns=""
- for dns in $dns; do
- echo "nameserver $dns" >> /tmp/resolv.conf.auto
- done
+ add_dns "$cfg" $dns
}
local demand
}
local demand
- config_get
_bool
demand "$cfg" demand 0
+ config_get demand "$cfg" demand 0
local demandargs
local demandargs
- [ "$demand" -eq 1 ] && {
- demandargs="precompiled-active-filter /etc/ppp/filter demand idle"
- [ "$has_dns" -eq 0 ] && \
- echo "nameserver 1.1.1.1" > /tmp/resolv.conf.auto
+ [ "$demand" -gt 0 ] && {
+ demandargs="precompiled-active-filter /etc/ppp/filter demand idle $demand"
+ [ "$has_dns" -eq 0 ] && add_dns "$cfg" 1.1.1.1
} || {
demandargs="persist"
}
} || {
demandargs="persist"
}
@@
-106,19
+98,19
@@
start_pppd() {
config_get_bool ipv6 "$cfg" ipv6 0
[ "$ipv6" -eq 1 ] && ipv6="+ipv6" || ipv6=""
config_get_bool ipv6 "$cfg" ipv6 0
[ "$ipv6" -eq 1 ] && ipv6="+ipv6" || ipv6=""
-
/usr/sbin/pppd
"$@" \
+
start-stop-daemon -S -b -x /usr/sbin/pppd -m -p /var/run/ppp-$link.pid --
"$@" \
${keepalive:+lcp-echo-interval $interval lcp-echo-failure ${keepalive%%[, ]*}} \
$demandargs \
$peerdns \
$defaultroute \
${username:+user "$username" password "$password"} \
${keepalive:+lcp-echo-interval $interval lcp-echo-failure ${keepalive%%[, ]*}} \
$demandargs \
$peerdns \
$defaultroute \
${username:+user "$username" password "$password"} \
- linkname "$link" \
ipparam "$cfg" \
ifname "$link" \
${connect:+connect "$connect"} \
${disconnect:+disconnect "$disconnect"} \
${ipv6} \
ipparam "$cfg" \
ifname "$link" \
${connect:+connect "$connect"} \
${disconnect:+disconnect "$disconnect"} \
${ipv6} \
- ${pppd_options}
+ ${pppd_options} \
+ nodetach
lock -u "/var/lock/ppp-${link}"
}
lock -u "/var/lock/ppp-${link}"
}