We failed to ignore SSH_MSG_IGNORE :-)

git-svn-id: svn://svn.tartarus.org/sgt/putty@219 cda61777-01e9-0310-a592-d414129be87e

diff --git a/scpssh.c b/scpssh.c
index b51cbb8..af56949 100644 (file)
--- a/scpssh.c
+++ b/scpssh.c
@@ -27,6 +27,7 @@
 #define SSH_CMSG_EOF           19
 #define SSH_SMSG_EXIT_STATUS   20
 #define SSH_CMSG_EXIT_CONFIRMATION     33
+#define SSH_MSG_IGNORE         32
 #define SSH_MSG_DEBUG          36
 
 #define GET_32BIT(cp) \
@@ -146,6 +147,9 @@ next_packet:
        }
        goto next_packet;
     }
+    if (pktin.type == SSH_MSG_IGNORE) {
+       goto next_packet;
+    }
 }
 
 static void s_wrpkt_start(int type, int len) {

diff --git a/ssh.c b/ssh.c
index 17a5923..0d53ddb 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -156,6 +156,8 @@ static void ssh_gotdata(unsigned char *data, int datalen) {
 
        if (pktin.type == 36) {        /* SSH_MSG_DEBUG */
            /* FIXME: log it */
+       } else if (pktin.type == 32) { /* SSH_MSG_IGNORE */
+           /* do nothing */;
        } else
            ssh_protocol(NULL, 0, 1);
     }