commit 62e5522dea2b8d8c68febfd799482dfac7b371e5
from: marcus <marcus@03d0f0ad-74f4-0310-ae7a-cf78699b6f6c>
date: Mon Oct 18 06:44:06 2004 UTC

SSH Disconnect fixes from Alison Winters.

commit - d7dce6678e2e1437071e2d5c870746b40a912a09
commit + 62e5522dea2b8d8c68febfd799482dfac7b371e5
blob - 2ffda8d0d5797e38cea107d60d166340ffda618c
blob + 379399d089575eb955da8daa267cb0ec7dda695d
--- de/mud/ssh/SshIO.java
+++ de/mud/ssh/SshIO.java
@@ -189,6 +189,7 @@ public abstract class SshIO {
 
   public void disconnect() {
     // System.err.println("In Disconnect");
+    idstr = "";
     login = "";
     password = "";
     phase = 0;
@@ -234,11 +235,14 @@ public abstract class SshIO {
         // followed by newline character(ascii 10 = '\n' or '\r')
         idstr += (char) b;
         if (b == '\n') {
-          phase++;
           if (!idstr.substring(0, 4).equals("SSH-")) {
-            System.out.println("Received invalid ID string: " + idstr + ", (substr " + idstr.substring(0, 4) + ")");
-            throw (new IOException());
+              // we need to ignore lines of data that precede the idstr
+              if (debug > 0)
+                System.out.print("Received data line: " + idstr);
+              idstr = "";
+              continue;
           }
+          phase++;
           remotemajor = Integer.parseInt(idstr.substring(4, 5));
           String minorverstr = idstr.substring(6, 8);
           if (!Character.isDigit(minorverstr.charAt(1)))
@@ -600,6 +604,7 @@ public abstract class SshIO {
       case SSH_SMSG_FAILURE:
         if (lastPacketSentType == SSH_CMSG_AUTH_PASSWORD) {// password incorrect ???
           System.out.println("failed to log in");
+          Send_SSH_MSG_DISCONNECT("Failed to log in.");
           disconnect();
           return "\nLogin & password not accepted\r\n";
         }
@@ -732,6 +737,7 @@ public abstract class SshIO {
             cipher_type = "DES";
           } else {
             System.err.println("SshIO: remote server does not supported IDEA, BlowFish or 3DES, support cypher mask is " + supported_ciphers_mask[3] + ".\n");
+            Send_SSH_MSG_DISCONNECT("No more auth methods available.");
             disconnect();
             return "\rRemote server does not support IDEA/Blowfish/3DES blockcipher, closing connection.\r\n";
           }
@@ -795,6 +801,17 @@ public abstract class SshIO {
   }
 
   /**
+   * SSH_MSG_DISCONNECT
+   *   string       disconnect reason
+   */
+  private String Send_SSH_MSG_DISCONNECT(String reason) throws IOException {
+    SshPacket1 p = new SshPacket1(SSH_MSG_DISCONNECT);
+    p.putString(reason);    // String   Disconnect reason
+    sendPacket1(p);
+    return "";
+  }
+
+  /**
    * SSH_CMSG_USER
    * string   user login name on server
    */