Myth/zjunet
1
0
Fork 0
mirror of https://github.com/QSCTech/zjunet.git synced 2026-01-22 19:54:48 +08:00
Code Issues Projects Releases Wiki Activity

update PPP_LOG_FILE

Browse Source
This commit is contained in:
Zeno Zeng 2014-09-21 17:20:38 +08:00
parent f7207ec06b
commit cedf768f4e
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
xl2tpd.sh Normal file → Executable file
View File

@ -19,6 +19,9 @@
# along with this program. If not, see # along with this program. If not, see
# <http://www.gnu.org/licenses/>. # <http://www.gnu.org/licenses/>.
PPP_LOG_FILE=/var/log/zjuvpn
xl2tpd_restart() { xl2tpd_restart() {
# for Openwrt / Debian / Ubuntu # for Openwrt / Debian / Ubuntu
@ -32,7 +35,7 @@ xl2tpd_restart() {
} }
# wait until ready # wait until ready
for i in $(seq 0 "${TIMEOUT}"); do for i in $(seq 0 120); do
if [ -e "/var/run/xl2tpd/l2tp-control" ]; then if [ -e "/var/run/xl2tpd/l2tp-control" ]; then
return 0 return 0
fi fi
@ -47,9 +50,10 @@ xl2tpd_create_lac() {
LNS="10.5.1.9" LNS="10.5.1.9"
LAC_NAME=zjuvpn-${username} LAC_NAME=zjuvpn-${username}
PPP_OPT_FILE=/etc/ppp/peers/${LAC_NAME} PPP_OPT_FILE=/etc/ppp/peers/${LAC_NAME}
PPP_LOG_FILE=/var/log/${LAC_NAME}
L2TPD_CFG_FILE=/etc/xl2tpd/xl2tpd.conf L2TPD_CFG_FILE=/etc/xl2tpd/xl2tpd.conf
touch $PPP_LOG_FILE
cat > $PPP_OPT_FILE <<EOF cat > $PPP_OPT_FILE <<EOF
noauth noauth
linkname $LAC_NAME linkname $LAC_NAME
@ -59,7 +63,9 @@ password $password
EOF EOF
chmod 600 $PPP_OPT_FILE chmod 600 $PPP_OPT_FILE
LAC=<<EOF touch $L2TPD_CFG_FILE
if ! grep -q "\[lac ${LAC_NAME}\]" $L2TPD_CFG_FILE; then
cat >> $L2TPD_CFG_FILE <<EOF
[lac ${LAC_NAME}] [lac ${LAC_NAME}]
lns = $LNS lns = $LNS
redial = no redial = no
@ -72,10 +78,6 @@ require pap = no
autodial = yes autodial = yes
EOF EOF
touch $L2TPD_CFG_FILE
if ! grep -q "\[lac ${LAC_NAME}\]" $L2TPD_CFG_FILE; then
echo $LAC >> $L2TPD_CFG_FILE
fi fi
} }
@ -88,26 +90,29 @@ disconnect() {
connect() { connect() {
username=$1 username=$1
LAC_NAME=zjuvpn-$1 LAC_NAME=zjuvpn-$1
xl2tpd-control disconnect ${LAC_NAME} xl2tpd-control disconnect ${LAC_NAME} > /dev/null
xl2tpd-control connect ${LAC_NAME} xl2tpd-control connect ${LAC_NAME} > /dev/null
echo -n "Connnecting..." echo -n > $PPP_LOG_FILE
prev_count=$(ip addr show | grep 'inet.*ppp' | grep ' 10.5.' | wc -l) prev_count=$(ip addr show | grep 'inet.*ppp' | grep ' 10.5.' | wc -l)
for i in $(seq 0 120); do for i in $(seq 0 120); do
echo -e "."
tail $PPP_LOG_FILE
count=$(ip addr show | grep 'inet.*ppp' | grep ' 10.5.' | wc -l) count=$(ip addr show | grep 'inet.*ppp' | grep ' 10.5.' | wc -l)
if [ ${count} -gt ${prev_count} ]; then if [ ${count} -gt ${prev_count} ]; then
echo "Bring up ppp. Done." echo "Bring up ppp, done."
return return
fi fi
sleep 1
done done
echo "Fail to bring up ppp. Timeout." echo "Fail to bring up ppp. Timeout."
disconnect disconnect $1
} }
case $1 in case $1 in