1
0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-01 03:22:48 -05:00

Pass an Interactor to new_connection().

Thanks to the previous commit, this new parameter can replace two of
the existing ones: instead of passing a LogPolicy and a Seat, we now
pass just an Interactor, from which any proxy implementation can
extract the LogPolicy and the Seat anyway if they need it.
This commit is contained in:
Simon Tatham
2021-10-30 17:36:52 +01:00
parent aac5e096fa
commit 89a390bdeb
14 changed files with 43 additions and 49 deletions

View File

@ -210,8 +210,7 @@ static char *raw_init(const BackendVtable *vt, Seat *seat,
* Open socket.
*/
raw->s = new_connection(addr, *realhost, port, false, true, nodelay,
keepalive, &raw->plug, conf,
log_get_policy(logctx), &raw->seat);
keepalive, &raw->plug, conf, &raw->interactor);
if ((err = sk_socket_error(raw->s)) != NULL)
return dupstr(err);

View File

@ -290,7 +290,7 @@ static char *rlogin_init(const BackendVtable *vt, Seat *seat,
*/
rlogin->s = new_connection(addr, *realhost, port, true, false,
nodelay, keepalive, &rlogin->plug, conf,
log_get_policy(logctx), &rlogin->seat);
&rlogin->interactor);
if ((err = sk_socket_error(rlogin->s)) != NULL)
return dupstr(err);

View File

@ -759,7 +759,7 @@ static char *supdup_init(const BackendVtable *x, Seat *seat,
*/
supdup->s = new_connection(addr, *realhost, port, false, true,
nodelay, keepalive, &supdup->plug, supdup->conf,
log_get_policy(logctx), &supdup->seat);
&supdup->interactor);
if ((err = sk_socket_error(supdup->s)) != NULL)
return dupstr(err);

View File

@ -782,7 +782,7 @@ static char *telnet_init(const BackendVtable *vt, Seat *seat,
*/
telnet->s = new_connection(addr, *realhost, port, false, true, nodelay,
keepalive, &telnet->plug, telnet->conf,
log_get_policy(logctx), &telnet->seat);
&telnet->interactor);
if ((err = sk_socket_error(telnet->s)) != NULL)
return dupstr(err);