From 51ae7a6ceb4eb669862b401c43fad90b30c78821 Mon Sep 17 00:00:00 2001
From: Long0x0 <51022287+Long0x0@users.noreply.github.com>
Date: Sun, 8 Oct 2023 01:27:06 +0800
Subject: [PATCH] Add compatibility for ppp version 2.5.0 (#89)

Co-authored-by: long <gmchenlong@gmail.com>
---
 lib/xl2tpd.sh | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/lib/xl2tpd.sh b/lib/xl2tpd.sh
index 7bd8e18..48a0c22 100755
--- a/lib/xl2tpd.sh
+++ b/lib/xl2tpd.sh
@@ -143,14 +143,18 @@ xl2tpd_waituser() {
         fi
         echo -n > $PPP_LOG_FILE
 
-        pid="/var/run/ppp-${LAC_NAME}.pid"
-        if [ -e $pid ]; then
-            ppp=$(cat $pid | grep ppp)
-            if ip addr show | grep "inet.*${ppp}" > /dev/null; then
-                ip addr show | grep "inet.*${ppp}" | sed 's/^ */[VPN] /'
-                return
+        for pid in "/var/run/ppp-${LAC_NAME}.pid" \
+                   "/var/run/pppdppp-${LAC_NAME}.pid" \
+                   "/var/run/pppd/ppp-${LAC_NAME}.pid"; do
+            if [ -e $pid ]; then
+                ppp=$(cat $pid | grep ppp)
+                if ip addr show | grep "inet.*${ppp}" > /dev/null; then
+                    ip addr show | grep "inet.*${ppp}" | sed 's/^ */[VPN] /'
+                    return
+                fi
+                break
             fi
-        fi
+        done
 
     done