X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/a9b9eacace42cffb4cc10a5b61c5633b94730999..4eddfed4b3d2c5afc0dd10662ad7f32808804329:/package/ppp/files/ppp.sh?ds=sidebyside diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh index 69051132e..e26749ebc 100644 --- a/package/ppp/files/ppp.sh +++ b/package/ppp/files/ppp.sh @@ -4,19 +4,26 @@ stop_interface_ppp() { local proto config_get proto "$cfg" proto - local ifname - config_get ifname "$cfg" ifname + local link="$proto-$cfg" + SERVICE_PID_FILE="/var/run/ppp-${link}.pid" \ + service_stop /usr/sbin/pppd - 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() { 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 @@ -25,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 } @@ -59,7 +66,7 @@ start_pppd() { local defaultroute config_get_bool defaultroute "$cfg" defaultroute 1 [ "$defaultroute" -eq 1 ] && \ - defaultroute="defaultroute replacedefaultroute" || defaultroute="" + defaultroute="defaultroute replacedefaultroute" || defaultroute="nodefaultroute" local interval="${keepalive##*[, ]}" [ "$interval" != "$keepalive" ] || interval=5 @@ -77,25 +84,20 @@ start_pppd() { local peerdns config_get_bool peerdns "$cfg" peerdns $peer_default - echo -n "" > /tmp/resolv.conf.auto - [ "$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 - 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" - [ "$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" } @@ -104,19 +106,23 @@ start_pppd() { config_get_bool ipv6 "$cfg" ipv6 0 [ "$ipv6" -eq 1 ] && ipv6="+ipv6" || ipv6="" - /usr/sbin/pppd "$@" \ + 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 \ $defaultroute \ ${username:+user "$username" password "$password"} \ - linkname "$link" \ ipparam "$cfg" \ ifname "$link" \ ${connect:+connect "$connect"} \ ${disconnect:+disconnect "$disconnect"} \ ${ipv6} \ - ${pppd_options} + ${pppd_options} \ + nodetach \ + ${nic} lock -u "/var/lock/ppp-${link}" }