Fix various small compiler warnings, mostly unused local variables

[u/mdw/putty] / ssh.c

diff --git a/ssh.c b/ssh.c
index 2c53823..b0f1651 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -507,7 +507,7 @@ static int ssh_rportcmp_ssh2(void *av, void *bv)
 {
     struct ssh_rportfwd *a = (struct ssh_rportfwd *) av;
     struct ssh_rportfwd *b = (struct ssh_rportfwd *) bv;
-    int i;
+
     if (a->sport > b->sport)
        return +1;
     if (a->sport < b->sport)
@@ -2841,6 +2841,19 @@ static void ssh1_protocol(unsigned char *in, int inlen, int ispkt)
                    pfd_confirm(c->u.pfd.s);
                }
 
+           } else if (pktin.type == SSH1_MSG_CHANNEL_OPEN_FAILURE) {
+               unsigned int remoteid = GET_32BIT(pktin.body);
+               unsigned int localid = GET_32BIT(pktin.body+4);
+               struct ssh_channel *c;
+
+               c = find234(ssh_channels, &remoteid, ssh_channelfind);
+               if (c && c->type == CHAN_SOCKDATA_DORMANT) {
+                   logevent("Forwarded connection refused by server");
+                   pfd_close(c->u.pfd.s);
+                   del234(ssh_channels, c);
+                   sfree(c);
+               }
+
            } else if (pktin.type == SSH1_MSG_CHANNEL_CLOSE ||
                       pktin.type == SSH1_MSG_CHANNEL_CLOSE_CONFIRMATION) {
                /* Remote side closes a channel. */
@@ -4716,22 +4729,29 @@ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt)
                c = find234(ssh_channels, &i, ssh_channelfind);
                if (!c)
                    continue;          /* nonexistent channel */
-               if (c->closes == 0) {
-                   ssh2_pkt_init(SSH2_MSG_CHANNEL_CLOSE);
-                   ssh2_pkt_adduint32(c->remoteid);
-                   ssh2_pkt_send();
-               }
                /* Do pre-close processing on the channel. */
                switch (c->type) {
                  case CHAN_MAINSESSION:
                    break;             /* nothing to see here, move along */
                  case CHAN_X11:
+                   if (c->u.x11.s != NULL)
+                       x11_close(c->u.x11.s);
+                   sshfwd_close(c);
                    break;
                  case CHAN_AGENT:
+                   sshfwd_close(c);
                    break;
                  case CHAN_SOCKDATA:
+                   if (c->u.pfd.s != NULL)
+                       pfd_close(c->u.pfd.s);
+                   sshfwd_close(c);
                    break;
                }
+               if (c->closes == 0) {
+                   ssh2_pkt_init(SSH2_MSG_CHANNEL_CLOSE);
+                   ssh2_pkt_adduint32(c->remoteid);
+                   ssh2_pkt_send();
+               }
                del234(ssh_channels, c);
                bufchain_clear(&c->v.v2.outbuffer);
                sfree(c);
@@ -4773,6 +4793,21 @@ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt)
                c->v.v2.remmaxpkt = ssh2_pkt_getuint32();
                bufchain_init(&c->v.v2.outbuffer);
                pfd_confirm(c->u.pfd.s);
+           } else if (pktin.type == SSH2_MSG_CHANNEL_OPEN_FAILURE) {
+               unsigned i = ssh2_pkt_getuint32();
+               struct ssh_channel *c;
+               c = find234(ssh_channels, &i, ssh_channelfind);
+               if (!c)
+                   continue;          /* nonexistent channel */
+               if (c->type != CHAN_SOCKDATA_DORMANT)
+                   continue;          /* dunno why they're failing this */
+
+               logevent("Forwarded connection refused by server");
+
+               pfd_close(c->u.pfd.s);
+
+               del234(ssh_channels, c);
+               sfree(c);
            } else if (pktin.type == SSH2_MSG_CHANNEL_OPEN) {
                char *type;
                int typelen;