X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/2ab3bb9aec6319c8b827beac46044120ca08bdbd..3b20aec50f6ec53d9e532d6718924f01305e8004:/package/ppp/files/ppp.sh

diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh
index 51a19555e..0bd75fc0a 100644
--- a/package/ppp/files/ppp.sh
+++ b/package/ppp/files/ppp.sh
@@ -1,25 +1,33 @@
 scan_ppp() {
 	config_get ifname "$1" ifname
 	pppdev="${pppdev:-0}"
-	config_set "$1" device "$ifname"
 	config_set "$1" ifname "ppp$pppdev"
 	config_set "$1" unit "$pppdev"
 }
 
 start_pppd() {
 	local cfg="$1"; shift
+
+	# make sure only one pppd process is started
+	lock "/var/lock/ppp-${cfg}"
+	local pid="$(head -n1 /var/run/ppp-${cfg}.pid 2>/dev/null)"
+	[ -d "/proc/$pid" ] && grep pppd "/proc/$pid/cmdline" 2>/dev/null >/dev/null && {
+		lock -u "/var/lock/ppp-${cfg}"
+		return 0
+	}
+
 	config_get device "$cfg" device
 	config_get unit "$cfg" unit
 	config_get username "$cfg" username
 	config_get password "$cfg" password
 	config_get keepalive "$cfg" keepalive
-	interval="${keepalive%%*[, ]}"
+	interval="${keepalive##*[, ]}"
 	[ "$interval" != "$keepalive" ] || interval=5
 	
 	config_get demand "$cfg" demand
-	[ -n "$demand" ] && echo "nameserver 1.1.1.1" > /tmp/resolv.conf
+	[ -n "$demand" ] && echo "nameserver 1.1.1.1" > /tmp/resolv.conf.auto
 	/usr/sbin/pppd "$@" \
-		${keepalive:+lcp-echo-interval $interval lcp-echo-failure ${keepalive##[, ]*}} \
+		${keepalive:+lcp-echo-interval $interval lcp-echo-failure ${keepalive%%[, ]*}} \
 		${demand:+precompiled-active-filter /etc/ppp/filter demand idle }${demand:-persist} \
 		usepeerdns \
 		defaultroute \
@@ -27,4 +35,6 @@ start_pppd() {
 		${username:+user "$username" password "$password"} \
 		linkname "$cfg" \
 		ipparam "$cfg"
+
+	lock -u "/var/lock/ppp-${cfg}"
 }