[backfire] package iptables hashlimit match (#8846)

[openwrt-10.03/.git] / package / ppp / files / ppp.sh

diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh
index 53cfb1be1aeb1a29988e502c6f1ded43364b4d93..996d542280cd1d8ea59ac4f55951e8ca97fceaea 100644 (file)
--- a/package/ppp/files/ppp.sh
+++ b/package/ppp/files/ppp.sh
@@ -5,15 +5,7 @@ stop_interface_ppp() {
        config_get proto "$cfg" proto
 
        local link="$proto-$cfg"
-       [ -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 && \
-                       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
-               rm -f "/var/run/ppp-${link}.pid"
-       }
+       service_kill pppd "/var/run/ppp-${link}.pid"
 
        remove_dns "$cfg"
 
@@ -92,11 +84,11 @@ start_pppd() {
        }
 
        local demand
-       config_get_bool demand "$cfg" demand 0
+       config_get demand "$cfg" demand 0
 
        local demandargs
-       [ "$demand" -eq 1 ] && {
-               demandargs="precompiled-active-filter /etc/ppp/filter demand idle"
+       [ "$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"