# HG changeset patch # User Pascal Bellard # Date 1351367998 -7200 # Node ID 0e1c8f449ff352c206a0c6d3206f4533d13b3d81 # Parent 15c36eea64cb20a14de50d328e9d7e02086b4beb ajaxterm: add telnet support diff -r 15c36eea64cb -r 0e1c8f449ff3 ajaxterm/stuff/usr/share/ajaxterm/login --- a/ajaxterm/stuff/usr/share/ajaxterm/login Fri Oct 26 13:09:58 2012 +0200 +++ b/ajaxterm/stuff/usr/share/ajaxterm/login Sat Oct 27 21:59:58 2012 +0200 @@ -17,8 +17,9 @@ # Get SSH server server="" -if [ -x /usr/bin/ssh ]; then - echo -n "SSH server: " +if [ -x /usr/bin/ssh -o -x /usr/bin/telnet ]; then + echo "Expected format [!][telnet/][user@][host][:port], default local login." + echo -n "TELNET/SSH server: " read -t 300 server || exit 1 fi @@ -26,9 +27,11 @@ [ -n "$server" ] || exec /bin/login # Allow non default SSH port with format server:port +port="" sshport="" case "$server" in -*:*) sshport="-p ${server#*:}" +*:*) port="${server#*:}" + sshport="-p $port" server=${server%:*};; esac @@ -43,7 +46,7 @@ # Get SSH user if missing case "$server" in -*@*) ;; +*/*|*@*) ;; *) echo -n "$server login: " read -t 30 user || exit 1 server="$user@$server";; @@ -52,4 +55,7 @@ # Launch OpenSSH or Dropbear sshargs="-oPreferredAuthentications=keyboard-interactive,password -oNoHostAuthenticationForLocalhost=yes -oLogLevel=FATAL -F/dev/null"; [ -L /usr/bin/ssh ] && sshargs="" -exec ssh $sshport $sshargs $server +case "$server" in +*/*) exec ${server%/*} ${server#*/} $port ;; +*) exec ssh $sshport $sshargs $server ;; +esac