nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 01:48:00 +00:00
Code Issues Projects Releases Wiki Activity

Make sure the socket is closed properly in the various SSH exit paths.

Browse Source 
[originally from svn r3037]
This commit is contained in:
Simon Tatham 2003-03-31 13:15:51 +00:00
parent ec6d5edb62
commit 09ba8ca111
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ssh.c
View File

@ -2475,7 +2475,7 @@ static int do_ssh1_login(Ssh ssh, unsigned char *in, int inlen, int ispkt)
* Terminate. * Terminate.
*/ */
logevent("No username provided. Abandoning session."); logevent("No username provided. Abandoning session.");
ssh->state = SSH_STATE_CLOSED; ssh_closing((Plug)ssh, NULL, 0, 0);
crReturn(1); crReturn(1);
} }
} else { } else {
@ -2753,7 +2753,7 @@ static int do_ssh1_login(Ssh ssh, unsigned char *in, int inlen, int ispkt)
PKT_END); PKT_END);
logevent("Unable to authenticate"); logevent("Unable to authenticate");
connection_fatal(ssh->frontend, "Unable to authenticate"); connection_fatal(ssh->frontend, "Unable to authenticate");
ssh->state = SSH_STATE_CLOSED; ssh_closing((Plug)ssh, NULL, 0, 0);
crReturn(1); crReturn(1);
} }
} else { } else {
@ -3331,7 +3331,7 @@ static void ssh1_protocol(Ssh ssh, unsigned char *in, int inlen, int ispkt)
ssh1_throttle(ssh, +1); ssh1_throttle(ssh, +1);
} }
} else if (ssh->pktin.type == SSH1_MSG_DISCONNECT) { } else if (ssh->pktin.type == SSH1_MSG_DISCONNECT) {
ssh->state = SSH_STATE_CLOSED; ssh_closing((Plug)ssh, NULL, 0, 0);
logevent("Received disconnect request"); logevent("Received disconnect request");
crReturnV; crReturnV;
} else if (ssh->pktin.type == SSH1_SMSG_X11_OPEN) { } else if (ssh->pktin.type == SSH1_SMSG_X11_OPEN) {
@ -3623,7 +3623,7 @@ static void ssh1_protocol(Ssh ssh, unsigned char *in, int inlen, int ispkt)
* encrypted packet, we close the session once * encrypted packet, we close the session once
* we've sent EXIT_CONFIRMATION. * we've sent EXIT_CONFIRMATION.
*/ */
ssh->state = SSH_STATE_CLOSED; ssh_closing((Plug)ssh, NULL, 0, 0);
crReturnV; crReturnV;
} else { } else {
bombout(("Strange packet received: type %d", ssh->pktin.type)); bombout(("Strange packet received: type %d", ssh->pktin.type));
@ -4403,7 +4403,7 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen, int ispkt)
* Terminate. * Terminate.
*/ */
logevent("No username provided. Abandoning session."); logevent("No username provided. Abandoning session.");
ssh->state = SSH_STATE_CLOSED; ssh_closing((Plug)ssh, NULL, 0, 0);
crReturnV; crReturnV;
} }
} else { } else {
@ -4917,7 +4917,7 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen, int ispkt)
logevent("Unable to authenticate"); logevent("Unable to authenticate");
connection_fatal(ssh->frontend, connection_fatal(ssh->frontend,
"Unable to authenticate"); "Unable to authenticate");
ssh->state = SSH_STATE_CLOSED; ssh_closing((Plug)ssh, NULL, 0, 0);
crReturnV; crReturnV;
} }
} else { } else {
@ -5106,7 +5106,7 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen, int ispkt)
" methods available"); " methods available");
ssh2_pkt_addstring(ssh, "en"); /* language tag */ ssh2_pkt_addstring(ssh, "en"); /* language tag */
ssh2_pkt_send(ssh); ssh2_pkt_send(ssh);
ssh->state = SSH_STATE_CLOSED; ssh_closing((Plug)ssh, NULL, 0, 0);
crReturnV; crReturnV;
} }
} }
@ -5653,6 +5653,7 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen, int ispkt)
* See if that was the last channel left open. * See if that was the last channel left open.
*/ */
if (count234(ssh->channels) == 0) { if (count234(ssh->channels) == 0) {
logevent("All channels closed. Disconnecting");
#if 0 #if 0
/* /*
* We used to send SSH_MSG_DISCONNECT here, * We used to send SSH_MSG_DISCONNECT here,
@ -5665,14 +5666,13 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen, int ispkt)
* this is more polite than sending a * this is more polite than sending a
* DISCONNECT. So now we don't. * DISCONNECT. So now we don't.
*/ */
logevent("All channels closed. Disconnecting");
ssh2_pkt_init(ssh, SSH2_MSG_DISCONNECT); ssh2_pkt_init(ssh, SSH2_MSG_DISCONNECT);
ssh2_pkt_adduint32(ssh, SSH2_DISCONNECT_BY_APPLICATION); ssh2_pkt_adduint32(ssh, SSH2_DISCONNECT_BY_APPLICATION);
ssh2_pkt_addstring(ssh, "All open channels closed"); ssh2_pkt_addstring(ssh, "All open channels closed");
ssh2_pkt_addstring(ssh, "en"); /* language tag */ ssh2_pkt_addstring(ssh, "en"); /* language tag */
ssh2_pkt_send(ssh); ssh2_pkt_send(ssh);
#endif #endif
ssh->state = SSH_STATE_CLOSED; ssh_closing((Plug)ssh, NULL, 0, 0);
crReturnV; crReturnV;
} }
continue; /* remote sends close; ignore (FIXME) */ continue; /* remote sends close; ignore (FIXME) */
@ -5750,7 +5750,7 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen, int ispkt)
ssh2_pkt_addstring(ssh, "en"); /* language tag */ ssh2_pkt_addstring(ssh, "en"); /* language tag */
ssh2_pkt_send(ssh); ssh2_pkt_send(ssh);
connection_fatal(ssh->frontend, "%s", buf); connection_fatal(ssh->frontend, "%s", buf);
ssh->state = SSH_STATE_CLOSED; ssh_closing((Plug)ssh, NULL, 0, 0);
crReturnV; crReturnV;
} }
@ -6365,7 +6365,10 @@ static void ssh_provide_logctx(void *handle, void *logctx)
static int ssh_return_exitcode(void *handle) static int ssh_return_exitcode(void *handle)
{ {
Ssh ssh = (Ssh) handle; Ssh ssh = (Ssh) handle;
return ssh->exitcode; if (ssh->s != NULL)
return -1;
else
return (ssh->exitcode >= 0 ? ssh->exitcode : 0);
} }
/* /*