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 | 1223494f1d1e64461b47330eb3a52e8abfd84891 (patch) | |
| tree | 301d9793c175d3d204e737135fed5f377df45efc | |
| parent | 3a13fb95abd5ccd0f3373d255ef06572e9b11d8c (diff) | |
| download | upstream-1223494f1d1e64461b47330eb3a52e8abfd84891.tar.gz upstream-1223494f1d1e64461b47330eb3a52e8abfd84891.tar.bz2 upstream-1223494f1d1e64461b47330eb3a52e8abfd84891.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
SVN-Revision: 20221
| -rw-r--r-- | package/ppp/files/ppp.sh | 47 | ||||
| -rw-r--r-- | package/pptp/files/pptp.init | 33 |
2 files changed, 71 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" } diff --git a/package/pptp/files/pptp.init b/package/pptp/files/pptp.init new file mode 100644 index 0000000000..024b8ceea2 --- /dev/null +++ b/package/pptp/files/pptp.init @@ -0,0 +1,33 @@ +#!/bin/sh /etc/rc.common +# Copyright (C) 2006 OpenWrt.org + +START=41 +STOP=30 + +updown_pptp_interface () { + config_get proto "$1" proto + if [ "$proto" = "pptp" ]; then + if$2 "$1" + fi +} + +boot () { + start +} + +start() { + config_load network + config_foreach updown_pptp_interface interface up +} + +restart() { + config_load network + config_foreach updown_pptp_interface interface down + config_foreach updown_pptp_interface interface up +} + +stop() { + config_load network + config_foreach updown_pptp_interface interface down +} + |