PuTTy: Diff

Differences From Artifact [dfac041c63]:

File ssh.c — part of check-in [18cc9933bb] at 2012-09-08 05:40:36 on branch trunk — Hiroshi Oota points out that PuTTY's agent forwarding sockets can get confused if they receive a request followed by immediate EOF, since we currently send outgoing EOF as soon as we see the incoming one - and then, when the response comes back from the real SSH agent, we send it along anyway as channel data in spite of having sent EOF. To fix this, I introduce a new field for each agent channel which counts the number of calls to ssh_agentf_callback that are currently expected, and we don't send EOF on an agent channel until we've both received EOF and that value drops to zero. (user: simon size: 311757)

To Artifact [1cb6dd1fd6]:

File ssh.c — part of check-in [45e5597a72] at 2012-09-08 14:46:07 on branch trunk — Most of the code for "nc" mode duplicated that for opening a session or a fowarded port. Arrange that this code is shared instead. The main visible change is a slight change of log messages. (user: ben size: 310529)

︙
9126 9127 9128 9129 9130 9131 9132 ~~9133 9134 9135 9136 9137~~ ~~9138 9139 9140~~ ~~9141 9142 9143 9144 9145~~ ~~9146 9147 9148 9149 9150~~ ~~9151 9152 9153 9154 9155 9156~~ 9157 9158 ~~9159~~ 9160 9161 9162 9163 9164 9165 9166 9167 9168 9169 9170 9171 9172 9173 ~~9174 9175 9176 9177 9178 9179 9180 9181 9182 9183 9184 9185 9186 9187 9188 9189 9190 9191 9192 9193 9194 9195 9196 9197 9198 9199~~ ~~9200~~ 9201 9202 9203 9204 9205 9206 9207	9126 9127 9128 9129 9130 9131 9132 9133 9134 9135 9136 9137 9138 9139 9140 9141 9142 9143 9144 9145 9146 9147 9148 9149 9150 9151 9152 9153 9154 9155 9156 9157 9158 9159 9160 9161 9162 9163 9164 9165 9166 9167 9168 9169 9170 9171 9172 9173 9174 9175 9176 9177 9178	+ + + + + - - - - - + + + + + - - - + - - - - - + + + + + + - - - - - + - - - - - - + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - + -	ssh2_msg_global_request; /* * Create the main session channel. / if (conf_get_int(ssh->conf, CONF_ssh_no_shell)) { ssh->mainchan = NULL; } else { ssh->mainchan = snew(struct ssh_channel); ssh->mainchan->ssh = ssh; ssh2_channel_init(ssh->mainchan); ~~~~} else~~ if (conf_get_str(ssh->conf, CONF_ssh_nc_host)) { /* * Just start a direct-tcpip channel and use it as the main * channel. /~~ if (conf_get_str(ssh->conf, CONF_ssh_nc_host)) { /* * Just start a direct-tcpip channel and use it as the main * channel. / ~~~~ssh->mainchan = snew(struct ssh_channel);~~ ~~ssh->mainchan->ssh = ssh;~~ ssh2_~~cha~~nn~~el_init~~(ssh->mainchan);~~ ssh_send_port_open(ssh->mainchan, ~~logeventf(ssh,~~ ~~"Opening direct-tcpip channel to %s:%d in place of session",~~ conf_get_str(ssh->conf, CONF_ssh_nc_host), conf_get_int(ssh->conf, CONF_ssh_nc_port)); s->pktout = ssh2_chanopen_init(ssh->mainchan, "di~~rect-tcpip~~"); conf_get_str(ssh->conf, CONF_ssh_nc_host), conf_get_int(ssh->conf, CONF_ssh_nc_port), "main channel"); ssh->ncmode = TRUE; } else { s->pktout = ssh2_chanopen_init(ssh->mainchan, "session"); ~~ssh2_pkt_addstring(s->pktout, conf_get_str(ssh->conf, CONF_ssh_nc_host));~~ ~~ssh2_pkt_adduint32(s->pktout, conf_get_int(ssh->conf, CONF_ssh_nc_port));~~ / * There's nothing meaningful to put in the originator * fi~~elds, but some~~ se~~rvers insist~~ on s~~yntactically~~ c~~orrect~~ logevent("Opening session as main channel"); * information. / ~~ssh2_pkt_addstring(s->pktout, "0.0.0.0");~~ ~~ssh2_pkt_adduint32(s->pktout, 0);~~ ssh2_pkt_send(ssh, s->pktout); ssh2_pkt_send(ssh, s->pktout); ssh->ncmode = FALSE; } crWaitUntilV(pktin); if (pktin->type != SSH2_MSG_CHANNEL_OPEN_CONFIRMATION) { ~~bombout(("Server refused to open ~~a direct-tcpip~~ channel"));~~ bombout(("Server refused to open channel")); crStopV; / FIXME: error data comes back in FAILURE packet / } if (ssh_pkt_getuint32(pktin) != ssh->mainchan->localid) { bombout(("Server's channel confirmation cited wrong channel")); crStopV; } ssh->mainchan->remoteid = ssh_pkt_getuint32(pktin); ssh->mainchan->halfopen = FALSE; ssh->mainchan->type = CHAN_MAINSESSION; ssh->mainchan->v.v2.remwindow = ssh_pkt_getuint32(pktin); ssh->mainchan->v.v2.remmaxpkt = ssh_pkt_getuint32(pktin); add234(ssh->channels, ssh->mainchan); update_specials_menu(ssh->frontend); ~~logevent("Opened direct-tcpip channel");~~ ~~ssh->ncmode = TRUE;~~ ~~} else {~~ ~~ssh->mainchan = snew(struct ssh_channel);~~ ~~ssh->mainchan->ssh = ssh;~~ ~~ssh2_channel_init(ssh->mainchan);~~ ~~s->pktout = ssh2_chanopen_init(ssh->mainchan, "session");~~ ~~ssh2_pkt_send(ssh, s->pktout);~~ ~~crWaitUntilV(pktin);~~ ~~if (pktin->type != SSH2_MSG_CHANNEL_OPEN_CONFIRMATION) {~~ ~~bombout(("Server refused to open a session"));~~ ~~crStopV;~~ ~~/ FIXME: error data comes back in FAILURE packet /~~ } ~~if (ssh_pkt_getuint32(pktin) != ssh->mainchan->localid) {~~ ~~bombout(("Server's channel confirmation cited wrong channel"));~~ ~~crStopV;~~ } ~~ssh->mainchan->remoteid = ssh_pkt_getuint32(pktin);~~ ~~ssh->mainchan->halfopen = FALSE;~~ ~~ssh->mainchan->type = CHAN_MAINSESSION;~~ ~~ssh->mainchan->v.v2.remwindow = ssh_pkt_getuint32(pktin);~~ ~~ssh->mainchan->v.v2.remmaxpkt = ssh_pkt_getuint32(pktin);~~ ~~add234(ssh->channels, ssh->mainchan);~~ ~~update_specials_menu(ssh->frontend);~~ logevent("Opened channel ~~for session~~"); logevent("Opened main channel"); ~~ssh->ncmode = FALSE;~~ } / * Now we have a channel, make dispatch table entries for * general channel-based messages. */ ssh->packet_dispatch[SSH2_MSG_CHANNEL_DATA] =
︙
10154 10155 10156 10157 10158 10159 10160 ~~10161~~ 10162 10163 10164 10165 10166 10167 10168	10125 10126 10127 10128 10129 10130 10131 10132 10133 10134 10135 10136 10137 10138 10139	- +	void ssh_send_port_open(void channel, char hostname, int port, char org) { struct ssh_channel c = (struct ssh_channel )channel; Ssh ssh = c->ssh; struct Packet pktout; ~~logeventf(ssh, "Opening ~~forwarded~~ connection to %s:%d", hostname, port);~~ logeventf(ssh, "Opening connection to %s:%d for %s", hostname, port, org); if (ssh->version == 1) { send_packet(ssh, SSH1_MSG_PORT_OPEN, PKT_INT, c->localid, PKT_STR, hostname, PKT_INT, port, /* PKT_STR, <org:orgport>, */
︙