wok-next diff dropbear/stuff/sshx @ rev 20533
cairo-clock, grub4dos: fix CFLAGS
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Tue Mar 27 12:50:45 2018 +0200 (2018-03-27) |
parents | 1ae2567134a8 |
children | 6475d1dc2a4d |
line diff
1.1 --- a/dropbear/stuff/sshx Tue Jul 26 13:47:19 2016 +0200 1.2 +++ b/dropbear/stuff/sshx Tue Mar 27 12:50:45 2018 +0200 1.3 @@ -6,18 +6,25 @@ 1.4 svr=${DISPLAY#*:} 1.5 n=$((10+($RANDOM % 90))); dpy=localhost:$n 1.6 scr=${DISPLAY/${DISPLAY%.*}/$dpy} 1.7 - r="" 1.8 + r="" ; p="22"; k="" 1.9 while true; do 1.10 a="$1" 1.11 r="$r $1"; shift 1.12 case "$a" in 1.13 + -p) p=$1 ;; 1.14 + -i) k="$k-i $1 " ;; 1.15 + esac 1.16 + case "$a" in 1.17 -[piIlLRWKBJ]) r="$r $1"; shift;; 1.18 -*) ;; 1.19 *) break ;; 1.20 esac 1.21 done 1.22 + xhost +localhost > /dev/null 2>&1 1.23 + pxypass="${DBPROXY_PASSWORD:+export DROPBEAR_PASSWORD=$DBPROXY_PASSWORD; }" 1.24 [ -n "$1" ] || set -- "${TERM:-xterm} -ls || ${TERM:-sakura} -l || xterm -ls" 1.25 exec dbclient -f -R $((6000+$n)):localhost:$((6000+${svr%.*})) $r \ 1.26 + ${DBPROXY:+-J "sh -c '${pxypass}dbclient ${k}-B ${a#*@}:$p $DBPROXY'"} \ 1.27 "xauth add $dpy $data; export DISPLAY=$scr; $@ ; xauth remove $dpy" \ 1.28 </dev/null >/dev/null 1.29 } 1.30 @@ -42,8 +49,12 @@ 1.31 n="${2:-$n.1:$n.2} passive" 1.32 ppp="/usr/sbin/pppd local noauth nodetach" 1.33 arg="$n pty '$ssh $1 $ppp ${3:-proxyarp} notty'" 1.34 - [ -n "$5" ] && arg="noipdefault pty 'nc -u ${1#*@} $5'" && $ssh -f $1 \ 1.35 - "$ppp $n ${3:-proxyarp} pty 'nc -ulp $5' >/dev/null" 1.36 + pppsvr="$ppp $n ${3:-proxyarp} notty >/dev/null" 1.37 + sshcmd="nc -ulp $5 -e $pppsvr" 1.38 + udpcmd="nc -u ${1#*@} $5" 1.39 + [ "$6" == "test" ] && sshcmd="nc -ulp $5 -e nc localhost 22" && 1.40 + udpcmd="dbclient -y -J \"nc -u ${1#*@} $5\" ${1%@*}@localhost $pppsvr" 1.41 + [ -n "$5" ] && arg="noipdefault pty '$udpcmd'" && $ssh -f $1 "$sshcmd" 1.42 eval $ppp $arg ipparam pppssh$$ 1.43 [ "$4" ] && route del $extra 1.44 rm -f /etc/ppp/ip-up.d/pppssh$$ 2> /dev/null 1.45 @@ -54,7 +65,8 @@ 1.46 p=5900 1.47 while netstat -tln | grep -q ":$p " ; do p=$(($p+1)); done 1.48 [ -r /dev/input/mice ] || echo "Warning: Cannot read mouse input." 1>&2 1.49 - dbclient -f -N -L $p:127.0.0.1:${2:-5900} $1 1.50 + svr=${1#*/}; [ "$svr" == "$1" ] && svr=127.0.0.1 1.51 + dbclient -y -f -N -L $p:$svr:${2:-5900} ${1%/*} 1.52 fbvnc 127.0.0.1 $p 1.53 kill $(netstat -tlnp 2> /dev/null | \ 1.54 sed "/:$p /!d;s|.* \\([0-9]*\\)/[^ ]*|\\1|") 1.55 @@ -62,13 +74,13 @@ 1.56 1.57 case "$(basename $0)" in 1.58 *vnc) [ -z "$1" ] && cat <<EOT || xfbvnc "$@" ;; 1.59 -Usage: $0 '[sshargs] user@remote' [vncport] 1.60 +Usage: $0 '[sshargs] user@remote[/lanip]' [vncport] 1.61 $(fbvnc --help 2>&1 | sed '1,/Usage:/d') 1.62 EOT 1.63 ppp*) [ -z "$1" ] && cat <<EOT || pppssh "$@" ;; 1.64 Usage: $0 '[sshargs] user@remote' '[localip:remoteip] [localpppargs]' 'remotepppargs' 'routes' [udp-port] 1.65 Example: $0 tux@slitaz.org '' '' '192.168.1.0/24 10.1.2.0/24' 1.66 EOT 1.67 -*) [ -z "$DISPLAY" ] && exec dbclient "$@" 1.68 - xauth list $DISPLAY | xdbclient "$@" 1.69 +*) [ -z "$DISPLAY" ] && exec dbclient -y "$@" 1.70 + xauth list $DISPLAY | xdbclient -y "$@" 1.71 esac