diff options
| author | Travis Kemen <thepeople@openwrt.org> | 2010-03-14 21:42:56 +0000 |
|---|---|---|
| committer | Travis Kemen <thepeople@openwrt.org> | 2010-03-14 21:42:56 +0000 |
| commit | f1389d9319560da12f8305e33b7daab1070adb9a (patch) | |
| tree | 6653a70bd4bbe64d78ab036e1d8cf35af0590c90 /package/ppp | |
| parent | 29b352391e39a074f2fd096e30203e663350e4f7 (diff) | |
| download | upstream-f1389d9319560da12f8305e33b7daab1070adb9a.tar.gz upstream-f1389d9319560da12f8305e33b7daab1070adb9a.tar.bz2 upstream-f1389d9319560da12f8305e33b7daab1070adb9a.zip | |
/lib/network/ppp.sh fixes a problem with PPtP (and other PPP-based things) where PPtP + PPPoE will fail to work. This is because PPtP defaults to ppp0 and so does PPPoE, because /etc/init.d/ppp reinitializes the unit counter for each PPP-type connection (so you could have multiple PPtP over cable, for instance, but PPPoE + PPtP is a problem).
/etc/init.d/ppp automatically starts pptp session on boot., from #6720
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20221 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/ppp')
| -rw-r--r-- | package/ppp/files/ppp.sh | 47 |
1 files changed, 38 insertions, 9 deletions
diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh index 23fcb89ffd..62f584fa88 100644 --- a/package/ppp/files/ppp.sh +++ b/package/ppp/files/ppp.sh @@ -1,15 +1,44 @@ scan_ppp() { config_get ifname "$1" ifname pppdev="${pppdev:-0}" - config_get unit "$1" unit - [ -z "$unit" ] && { - unit="$pppdev" - if [ "${ifname%%[0-9]*}" = ppp ]; then - unit="${ifname##ppp}" - [ "$pppdev" -le "$unit" ] && pppdev="$(($unit + 1))" - else - pppdev="$(($pppdev + 1))" - fi + config_get devunit "$1" unit + { + unit= + pppif= + if [ ! -d /tmp/.ppp-counter ]; then + mkdir -p /tmp/.ppp-counter + fi + local maxunit + maxunit="$(cat /tmp/.ppp-counter/max-unit 2>/dev/null)" + if [ -z "$maxunit" ]; then + maxunit=-1 + fi + local i + i=0 + while [ $i -le $maxunit ]; do + local unitdev + unitdev="$(cat /tmp/.ppp-counter/ppp${i} 2>/dev/null)" + if [ "$unitdev" = "$1" ]; then + unit="$i" + pppif="ppp${i}" + break + fi + i="$(($i + 1))" + done + if [ -z "$unit" ] || [ -z "$pppif" ]; then + maxunit="$(($maxunit + 1))" + if [ -n "$devunit" ]; then + unit="$devunit" + elif [ "${ifname%%[0-9]*}" = ppp ]; then + unit="${ifname##ppp}" + else + unit="$maxunit" + fi + [ "$maxunit" -lt "$unit" ] && maxunit="$unit" + pppif="ppp${unit}" + echo "$1" >/tmp/.ppp-counter/$pppif 2>/dev/null + echo "$maxunit" >/tmp/.ppp-counter/max-unit 2>/dev/null + fi config_set "$1" ifname "ppp$unit" config_set "$1" unit "$unit" } |