bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[packages] sshtunnel: bug fix

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@24807 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nunojpg 2010-12-22 23:14:01 +00:00
parent 8cf514a8b0
commit d5391e6226
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
net/sshtunnel/files/initd_sshtunnel
View File

@ -135,11 +135,11 @@ load_server() {
[ -n "$error" ] && { logger -p user.err -t "sshtunnel" "tunnels to $server not started - $error"; return; } [ -n "$error" ] && { logger -p user.err -t "sshtunnel" "tunnels to $server not started - $error"; return; }
[ "$count" -eq 0 ] && { logger -p user.err -t "sshtunnel" "tunnels to $server not started - no tunnels defined"; return; } [ "$count" -eq 0 ] && { logger -p user.err -t "sshtunnel" "tunnels to $server not started - no tunnels defined"; return; }
append_params CheckHostIP Compression CompressionLevel IdentityFile LogLevel PKCS11Provider ServerAliveCountMax ServerAliveInterval StrickHostKeyChecking TCPKeepAlive VerifyHostKeyDNS append_params CheckHostIP Compression CompressionLevel IdentityFile LogLevel PKCS11Provider ServerAliveCountMax ServerAliveInterval StrictHostKeyChecking TCPKeepAlive VerifyHostKeyDNS
ARGS="$ARGS_options -o ExitOnForwardFailure=yes -o BatchMode=yes -nN $ARGS_tunnels $user@$hostname" ARGS="$ARGS_options -o ExitOnForwardFailure=yes -o BatchMode=yes -nN $ARGS_tunnels $user@$hostname"
/usr/bin/sshtunnel.sh "$ARGS" "$retrydelay" "$server" & /usr/bin/sshtunnel.sh "$ARGS" "$retrydelay" "$server" &
echo $! >> "$PIDFILE".pids echo $! >> "${PIDFILE}.pids"
logger -p user.info -t "sshtunnel" "started tunnels to $server (pid=$!;retrydelay=$retrydelay)" logger -p user.info -t "sshtunnel" "started tunnels to $server (pid=$!;retrydelay=$retrydelay)"
} }
@ -150,13 +150,18 @@ stop() {
while read pid while read pid
do do
start-stop-daemon -K -p "$PIDFILE"_"$pid".pid kill "$pid" # kill mother process first
kill $pid
logger -p daemon.info -t "sshtunnel[$pid]" "tunnel stopped"
rm "$PIDFILE"_"$pid".pid
done < "$PIDFILE".pids
rm "$PIDFILE".pids [ -f "${PIDFILE}_${pid}.pid" ] && { # if ssh was running, kill it also (mother process could be in retry wait)
start-stop-daemon -K -p "${PIDFILE}_${pid}.pid"
rm "${PIDFILE}_${pid}.pid"
}
logger -p daemon.info -t "sshtunnel[$pid]" "tunnel stopped"
done < "${PIDFILE}.pids"
rm "${PIDFILE}.pids"
logger -p user.info -t "sshtunnel" "all tunnels stopped" logger -p user.info -t "sshtunnel" "all tunnels stopped"
else else
@ -165,7 +170,7 @@ stop() {
} }
start() { start() {
[ -f "$PIDFILE".pids ] && stop [ -f "${PIDFILE}.pids" ] && stop
config_load sshtunnel config_load sshtunnel
if [ -n "$(uci show sshtunnel.@server[0])" ] # at least one server section exists if [ -n "$(uci show sshtunnel.@server[0])" ] # at least one server section exists

3
net/sshtunnel/files/sshtunnel.sh
View File

@ -10,11 +10,12 @@ while true
do do
logger -p daemon.info -t "sshtunnel[$$][$server]" "connection started" logger -p daemon.info -t "sshtunnel[$$][$server]" "connection started"
start-stop-daemon -S -p "$PIDFILE"_"$$".pid -mx ssh -- $args &>/tmp/log/sshtunnel_$$ start-stop-daemon -S -p "${PIDFILE}_${$}.pid" -mx ssh -- $args &>/tmp/log/sshtunnel_$$
logger -p daemon.err -t "sshtunnel[$$][$server]" < /tmp/log/sshtunnel_$$ logger -p daemon.err -t "sshtunnel[$$][$server]" < /tmp/log/sshtunnel_$$
rm /tmp/log/sshtunnel_$$ rm /tmp/log/sshtunnel_$$
logger -p daemon.info -t "sshtunnel[$$][$server]" "ssh exited with code $?, retrying in $retrydelay seconds" logger -p daemon.info -t "sshtunnel[$$][$server]" "ssh exited with code $?, retrying in $retrydelay seconds"
rm "${PIDFILE}_${$}.pid"
sleep "$retrydelay" & wait sleep "$retrydelay" & wait
done done