Unify GET_32BIT()/PUT_32BIT() et al from numerous source files into misc.h.

[u/mdw/putty] / ssh.c

diff --git a/ssh.c b/ssh.c
index 41ef92f..b5f34a5 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -256,18 +256,6 @@ static char *ssh2_pkt_type(int pkt_ctx, int type)
 #undef translate
 #undef translatec
 
-#define GET_32BIT(cp) \
-    (((unsigned long)(unsigned char)(cp)[0] << 24) | \
-    ((unsigned long)(unsigned char)(cp)[1] << 16) | \
-    ((unsigned long)(unsigned char)(cp)[2] << 8) | \
-    ((unsigned long)(unsigned char)(cp)[3]))
-
-#define PUT_32BIT(cp, value) { \
-    (cp)[0] = (unsigned char)((value) >> 24); \
-    (cp)[1] = (unsigned char)((value) >> 16); \
-    (cp)[2] = (unsigned char)((value) >> 8); \
-    (cp)[3] = (unsigned char)(value); }
-
 /* Enumeration values for fields in SSH-1 packets */
 enum {
     PKT_END, PKT_INT, PKT_CHAR, PKT_DATA, PKT_STR, PKT_BIGNUM,
@@ -2112,7 +2100,7 @@ static void ssh_detect_bugs(Ssh ssh, char *vstring)
         * an AUTH_RSA message.
         */
        ssh->remote_bugs |= BUG_CHOKES_ON_RSA;
-       logevent("We believe remote version can't handle RSA authentication");
+       logevent("We believe remote version can't handle SSH-1 RSA authentication");
     }
 
     if (ssh->cfg.sshbug_hmac2 == FORCE_ON ||
@@ -2444,6 +2432,7 @@ static int ssh_do_close(Ssh ssh, int notify_exit)
     struct ssh_channel *c;
 
     ssh->state = SSH_STATE_CLOSED;
+    expire_timer_context(ssh);
     if (ssh->s) {
         sk_close(ssh->s);
         ssh->s = NULL;
@@ -5677,6 +5666,32 @@ static int ssh2_try_send(struct ssh_channel *c)
     return bufchain_size(&c->v.v2.outbuffer);
 }
 
+static void ssh2_try_send_and_unthrottle(struct ssh_channel *c)
+{
+    int bufsize;
+    if (c->closes)
+       return;                        /* don't send on closing channels */
+    bufsize = ssh2_try_send(c);
+    if (bufsize == 0) {
+       switch (c->type) {
+         case CHAN_MAINSESSION:
+           /* stdin need not receive an unthrottle
+            * notification since it will be polled */
+           break;
+         case CHAN_X11:
+           x11_unthrottle(c->u.x11.s);
+           break;
+         case CHAN_AGENT:
+           /* agent sockets are request/response and need no
+            * buffer management */
+           break;
+         case CHAN_SOCKDATA:
+           pfd_unthrottle(c->u.pfd.s);
+           break;
+       }
+    }
+}
+
 /*
  * Potentially enlarge the window on an SSH-2 channel.
  */
@@ -5715,8 +5730,10 @@ static void ssh2_msg_channel_window_adjust(Ssh ssh, struct Packet *pktin)
     unsigned i = ssh_pkt_getuint32(pktin);
     struct ssh_channel *c;
     c = find234(ssh->channels, &i, ssh_channelfind);
-    if (c && !c->closes)
+    if (c && !c->closes) {
        c->v.v2.remwindow += ssh_pkt_getuint32(pktin);
+       ssh2_try_send_and_unthrottle(c);
+    }
 }
 
 static void ssh2_msg_channel_data(Ssh ssh, struct Packet *pktin)
@@ -7414,30 +7431,8 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen,
            /*
             * Try to send data on all channels if we can.
             */
-           for (i = 0; NULL != (c = index234(ssh->channels, i)); i++) {
-               int bufsize;
-               if (c->closes)
-                   continue;          /* don't send on closing channels */
-               bufsize = ssh2_try_send(c);
-               if (bufsize == 0) {
-                   switch (c->type) {
-                     case CHAN_MAINSESSION:
-                       /* stdin need not receive an unthrottle
-                        * notification since it will be polled */
-                       break;
-                     case CHAN_X11:
-                       x11_unthrottle(c->u.x11.s);
-                       break;
-                     case CHAN_AGENT:
-                       /* agent sockets are request/response and need no
-                        * buffer management */
-                       break;
-                     case CHAN_SOCKDATA:
-                       pfd_unthrottle(c->u.pfd.s);
-                       break;
-                   }
-               }
-           }
+           for (i = 0; NULL != (c = index234(ssh->channels, i)); i++)
+               ssh2_try_send_and_unthrottle(c);
        }
     }
 
@@ -7565,6 +7560,9 @@ static void ssh2_timer(void *ctx, long now)
 {
     Ssh ssh = (Ssh)ctx;
 
+    if (ssh->state == SSH_STATE_CLOSED)
+       return;
+
     if (!ssh->kex_in_progress && ssh->cfg.ssh_rekey_time != 0 &&
        now - ssh->next_rekey >= 0) {
        do_ssh2_transport(ssh, "timeout", -1, NULL);
@@ -8049,6 +8047,7 @@ static void ssh_special(void *handle, Telnet_Special code)
            struct Packet *pktout = ssh2_pkt_init(SSH2_MSG_CHANNEL_EOF);
            ssh2_pkt_adduint32(pktout, ssh->mainchan->remoteid);
            ssh2_pkt_send(ssh, pktout);
+            ssh->send_ok = 0;          /* now stop trying to read from stdin */
        }
        logevent("Sent EOF message");
     } else if (code == TS_PING || code == TS_NOP) {