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

All of the initial CHANNEL_REQUESTs are conditional on (ssh->mainchan &&

Browse Source 
!ssh->ncmode), so bundle them up in a big block conditional on this rather
than checking it five times.

[originally from svn r9647]
This commit is contained in:
Ben Harris 2012-09-01 12:03:12 +00:00
parent 54da9ee07a
commit 98e562b7f6
1 changed files with 74 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

156
ssh.c
View File

@ -9226,100 +9226,92 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen,
*/ */
ssh_setup_portfwd(ssh, ssh->conf); ssh_setup_portfwd(ssh, ssh->conf);
/* if (ssh->mainchan && !ssh->ncmode) {
* Send the CHANNEL_REQUESTS for the main channel. Each one is /*
* handled by its own little asynchronous co-routine. * Send the CHANNEL_REQUESTS for the main session channel.
*/ * Each one is handled by its own little asynchronous
* co-routine.
*/
/* /* Potentially enable X11 forwarding. */
* Potentially enable X11 forwarding. if (conf_get_int(ssh->conf, CONF_x11_forward) &&
*/ (ssh->x11disp =
/* x11_setup_display(conf_get_str(ssh->conf, CONF_x11_display),
* Potentially enable X11 forwarding. conf_get_int(ssh->conf, CONF_x11_auth),
*/ ssh->conf)))
if (ssh->mainchan && !ssh->ncmode && conf_get_int(ssh->conf, CONF_x11_forward) && ssh2_setup_x11(ssh->mainchan, NULL, NULL);
(ssh->x11disp = x11_setup_display(conf_get_str(ssh->conf, CONF_x11_display),
conf_get_int(ssh->conf, CONF_x11_auth), ssh->conf)))
ssh2_setup_x11(ssh->mainchan, NULL, NULL);
/* /* Potentially enable agent forwarding. */
* Potentially enable agent forwarding. if (conf_get_int(ssh->conf, CONF_agentfwd) && agent_exists())
*/ ssh2_setup_agent(ssh->mainchan, NULL, NULL);
if (ssh->mainchan && !ssh->ncmode && conf_get_int(ssh->conf, CONF_agentfwd) && agent_exists())
ssh2_setup_agent(ssh->mainchan, NULL, NULL);
/* /* Now allocate a pty for the session. */
* Now allocate a pty for the session. if (!conf_get_int(ssh->conf, CONF_nopty))
*/ ssh2_setup_pty(ssh->mainchan, NULL, NULL);
if (ssh->mainchan && !ssh->ncmode && !conf_get_int(ssh->conf, CONF_nopty)) {
ssh2_setup_pty(ssh->mainchan, NULL, NULL);
} else {
ssh->editing = ssh->echoing = 1;
}
/* /* Send environment variables. */
* Send environment variables. ssh2_setup_env(ssh->mainchan, NULL, NULL);
*/
if (ssh->mainchan && !ssh->ncmode)
ssh2_setup_env(ssh->mainchan, NULL, NULL);
/* /*
* Start a shell or a remote command. We may have to attempt * Start a shell or a remote command. We may have to attempt
* this twice if the config data has provided a second choice * this twice if the config data has provided a second choice
* of command. * of command.
*/ */
if (ssh->mainchan && !ssh->ncmode) while (1) { while (1) {
int subsys; int subsys;
char *cmd; char *cmd;
if (ssh->fallback_cmd) { if (ssh->fallback_cmd) {
subsys = conf_get_int(ssh->conf, CONF_ssh_subsys2); subsys = conf_get_int(ssh->conf, CONF_ssh_subsys2);
cmd = conf_get_str(ssh->conf, CONF_remote_cmd2); cmd = conf_get_str(ssh->conf, CONF_remote_cmd2);
} else { } else {
subsys = conf_get_int(ssh->conf, CONF_ssh_subsys); subsys = conf_get_int(ssh->conf, CONF_ssh_subsys);
cmd = conf_get_str(ssh->conf, CONF_remote_cmd); cmd = conf_get_str(ssh->conf, CONF_remote_cmd);
} }
if (subsys) { if (subsys) {
s->pktout = ssh2_chanreq_init(ssh->mainchan, "subsystem", s->pktout = ssh2_chanreq_init(ssh->mainchan, "subsystem",
ssh2_response_authconn, NULL); ssh2_response_authconn, NULL);
ssh2_pkt_addstring(s->pktout, cmd); ssh2_pkt_addstring(s->pktout, cmd);
} else if (*cmd) { } else if (*cmd) {
s->pktout = ssh2_chanreq_init(ssh->mainchan, "exec", s->pktout = ssh2_chanreq_init(ssh->mainchan, "exec",
ssh2_response_authconn, NULL); ssh2_response_authconn, NULL);
ssh2_pkt_addstring(s->pktout, cmd); ssh2_pkt_addstring(s->pktout, cmd);
} else { } else {
s->pktout = ssh2_chanreq_init(ssh->mainchan, "shell", s->pktout = ssh2_chanreq_init(ssh->mainchan, "shell",
ssh2_response_authconn, NULL); ssh2_response_authconn, NULL);
} }
ssh2_pkt_send(ssh, s->pktout); ssh2_pkt_send(ssh, s->pktout);
crWaitUntilV(pktin); crWaitUntilV(pktin);
if (pktin->type != SSH2_MSG_CHANNEL_SUCCESS) { if (pktin->type != SSH2_MSG_CHANNEL_SUCCESS) {
if (pktin->type != SSH2_MSG_CHANNEL_FAILURE) { if (pktin->type != SSH2_MSG_CHANNEL_FAILURE) {
bombout(("Unexpected response to shell/command request:" bombout(("Unexpected response to shell/command request:"
" packet type %d", pktin->type)); " packet type %d", pktin->type));
crStopV;
}
/*
* We failed to start the command. If this is the
* fallback command, we really are finished; if it's
* not, and if the fallback command exists, try falling
* back to it before complaining.
*/
if (!ssh->fallback_cmd &&
*conf_get_str(ssh->conf, CONF_remote_cmd2)) {
logevent("Primary command failed; attempting fallback");
ssh->fallback_cmd = TRUE;
continue;
}
bombout(("Server refused to start a shell/command"));
crStopV; crStopV;
} else {
logevent("Started a shell/command");
} }
/* break;
* We failed to start the command. If this is the
* fallback command, we really are finished; if it's
* not, and if the fallback command exists, try falling
* back to it before complaining.
*/
if (!ssh->fallback_cmd &&
*conf_get_str(ssh->conf, CONF_remote_cmd2)) {
logevent("Primary command failed; attempting fallback");
ssh->fallback_cmd = TRUE;
continue;
}
bombout(("Server refused to start a shell/command"));
crStopV;
} else {
logevent("Started a shell/command");
} }
break; } else {
ssh->editing = ssh->echoing = TRUE;
} }
ssh->state = SSH_STATE_SESSION; ssh->state = SSH_STATE_SESSION;