X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/b62840e4e7a53cfeb233cbeb2edbba32bf551ad1..4eddfed4b3d2c5afc0dd10662ad7f32808804329:/package/ppp/files/ppp.sh?ds=sidebyside diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh index 53cfb1be1..e26749ebc 100644 --- a/package/ppp/files/ppp.sh +++ b/package/ppp/files/ppp.sh @@ -5,15 +5,8 @@ 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_PID_FILE="/var/run/ppp-${link}.pid" \ + service_stop /usr/sbin/pppd remove_dns "$cfg" @@ -24,6 +17,13 @@ stop_interface_ppp() { start_pppd() { local cfg="$1"; shift + # Workaround for PPPoE service and AC name options, + # filter out the nic-* argument and append it as last option + local nic="" + case "$1" in + nic-*) nic="$1"; shift ;; + esac + local proto config_get proto "$cfg" proto @@ -32,8 +32,8 @@ start_pppd() { # make sure only one pppd process is started lock "/var/lock/ppp-${link}" - local pid="$(head -n1 /var/run/ppp-${link}.pid 2>/dev/null)" - [ -d "/proc/$pid" ] && grep pppd "/proc/$pid/cmdline" 2>/dev/null >/dev/null && { + SERVICE_PID_FILE="/var/run/ppp-${link}.pid" \ + service_check /usr/sbin/pppd && { lock -u "/var/lock/ppp-${link}" return 0 } @@ -92,11 +92,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" @@ -106,7 +106,10 @@ start_pppd() { 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 -- "$@" \ + SERVICE_DAEMONIZE=1 \ + SERVICE_WRITE_PID=1 \ + SERVICE_PID_FILE="/var/run/ppp-$link.pid" \ + service_start /usr/sbin/pppd "$@" \ ${keepalive:+lcp-echo-interval $interval lcp-echo-failure ${keepalive%%[, ]*}} \ $demandargs \ $peerdns \ @@ -118,7 +121,8 @@ start_pppd() { ${disconnect:+disconnect "$disconnect"} \ ${ipv6} \ ${pppd_options} \ - nodetach + nodetach \ + ${nic} lock -u "/var/lock/ppp-${link}" }