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

Defer passing a ConnectionLayer to sshshare.c.

Browse Source 
This paves the way for me to reorganise ssh.c in a way that will mean
I don't have a ConnectionLayer available yet at the time I have to
create the connshare. The constructor function now takes a mere
Frontend, for generating setup-time Event Log messages, and there's a
separate ssh_connshare_provide_connlayer() function I can call later
once I have the ConnectionLayer to provide.

NFC for the moment: the new provide_connlayer function is called
immediately after ssh_connection_sharing_init.
This commit is contained in:
Simon Tatham
2018-09-21 17:00:36 +01:00
parent 54b300f154
commit a703f86731
3 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ssh.c
View File

@ -1249,8 +1249,11 @@ static const char *connect_to_host(Ssh ssh, const char *host, int port,
ssh->connshare = NULL;
ssh->attempting_connshare = TRUE; /* affects socket logging behaviour */
ssh->s = ssh_connection_sharing_init(
ssh->savedhost, ssh->savedport, ssh->conf, &ssh->cl, &ssh->plugvt,
&ssh->connshare);
ssh->savedhost, ssh->savedport, ssh->conf, ssh->frontend,
&ssh->plugvt, &ssh->connshare);
if (ssh->connshare)
ssh_connshare_provide_connlayer(ssh->connshare, &ssh->cl);
ssh->attempting_connshare = FALSE;
if (ssh->s != NULL) {
/*