nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-03 04:22:47 -05:00
Code Issues Projects Releases Wiki Activity

Option to log proxy setup diagnostics to the terminal.

Browse Source 
It has three settings: on, off, and 'only until session starts'. The
idea of the last one is that if you use something like 'ssh -v' as
your proxy command, you probably wanted to see the initial SSH
connection-setup messages while you were waiting to see if the
connection would be set up successfully at all, but probably _didn't_
want a slew of diagnostics from rekeys disrupting your terminal in
mid-emacs once the session had got properly under way.

Default is off, to avoid startling people used to the old behaviour. I
wonder if I should have set it more aggressively, though.
This commit is contained in:
Simon Tatham
2015-11-22 14:33:28 +00:00
parent 297efff303
commit 7c65b9c57a
10 changed files with 63 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ssh.c
View File

@ -792,6 +792,7 @@ struct ssh_tag {
int send_ok;
int echoing, editing;
int session_started;
void *frontend;
int ospeed, ispeed; /* temporaries */
@ -3070,6 +3071,8 @@ static int do_ssh_init(Ssh ssh, unsigned char c)
crReturn(1);
}
ssh->session_started = TRUE;
s->vstrsize = sizeof(protoname) + 16;
s->vstring = snewn(s->vstrsize, char);
strcpy(s->vstring, protoname);
@ -3464,7 +3467,8 @@ static void ssh_socket_log(Plug plug, int type, SockAddr addr, int port,
if (!ssh->attempting_connshare)
backend_socket_log(ssh->frontend, type, addr, port,
error_msg, error_code);
error_msg, error_code, ssh->conf,
ssh->session_started);
}
void ssh_connshare_log(Ssh ssh, int event, const char *logtext,
@ -10998,6 +11002,7 @@ static const char *ssh_init(void *frontend_handle, void **backend_handle,
ssh->X11_fwd_enabled = FALSE;
ssh->connshare = NULL;
ssh->attempting_connshare = FALSE;
ssh->session_started = FALSE;
*backend_handle = ssh;