- make pppd shutdown more robust as pptp hangs when the underlying connection is gone
- don't rely on pid files generated by pppd, they're missing if the link is done, generate a per-instance pidfile with ssd instead
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21387
3c298f89-4303-0410-b956-
a3cf2f4a3e73
local ifname
config_get ifname "$cfg" ifname
local ifname
config_get ifname "$cfg" ifname
- [ -f "/var/run/ppp-${ifname}.pid" ] && {
- local pid="$(head -n1 /var/run/ppp-${ifname}.pid 2>/dev/null)"
+ local link="$proto-${ifname#$proto-}"
+ [ -f "/var/run/ppp-${link}.pid" ] && {
+ local pid="$(head -n1 /var/run/ppp-${link}.pid 2>/dev/null)"
+ local try=0
grep -qs pppd "/proc/$pid/cmdline" && kill -TERM $pid && \
grep -qs pppd "/proc/$pid/cmdline" && kill -TERM $pid && \
+ while grep -qs pppd "/proc/$pid/cmdline" && [ $((try++)) -lt 5 ]; do sleep 1; done
+ grep -qs pppd "/proc/$pid/cmdline" && kill -KILL $pid && \
while grep -qs pppd "/proc/$pid/cmdline"; do sleep 1; done
while grep -qs pppd "/proc/$pid/cmdline"; do sleep 1; done
- rm -f "/var/run/ppp-${ifname}.pid"
+ rm -f "/var/run/ppp-${link}.pid"
- local lock="/var/lock/ppp-$ifname"
+ local lock="/var/lock/ppp-$link"
[ -f "$lock" ] && lock -u "$lock"
}
[ -f "$lock" ] && lock -u "$lock"
}
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=""
+ 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"} \
ipparam "$cfg" \
ifname "$link" \
${connect:+connect "$connect"} \
${disconnect:+disconnect "$disconnect"} \
${ipv6} \
ipparam "$cfg" \
ifname "$link" \
${connect:+connect "$connect"} \
${disconnect:+disconnect "$disconnect"} \
${ipv6} \
+ ${pppd_options} \
+ nodetach
lock -u "/var/lock/ppp-${link}"
}
lock -u "/var/lock/ppp-${link}"
}