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

Pass an Interactor to new_connection().

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

24
network.h
View File

@ -137,19 +137,14 @@ struct PlugVtable {
* layer is now responsible for freeing it, and the caller shouldn't
* assume it exists any more.
*
* You can optionally pass a LogPolicy to this function, which will be
* passed on in turn to proxy types that can use one (e.g. SSH jump
* host proxy). If you don't have one, all proxy types are required to
* be able to manage without (and will just degrade their logging
* control).
*
* If calling this from a backend with a Seat, you can also give it a
* pointer to your 'Seat *'. In that situation, it might replace the
* 'Seat *' with a temporary seat of its own, and give the real Seat
* to the proxy system so that it can ask for passwords (and, in the
* case of SSH proxying, other prompts like host key checks). If that
* happens, then the resulting 'temp seat' is the backend's property,
* and it will have to remember to free it when cleaning up, or after
* pointer to the backend's Interactor trait. In that situation, it
* might replace the backend's seat with a temporary seat of its own,
* and give the real Seat to an Interactor somewhere in the proxy
* system so that it can ask for passwords (and, in the case of SSH
* proxying, other prompts like host key checks). If that happens,
* then the resulting 'temp seat' is the backend's property, and it
* will have to remember to free it when cleaning up, or after
* flushing it back into the real seat when the network connection
* attempt completes.
*
@ -163,7 +158,7 @@ struct PlugVtable {
Socket *new_connection(SockAddr *addr, const char *hostname,
int port, bool privport,
bool oobinline, bool nodelay, bool keepalive,
Plug *plug, Conf *conf, LogPolicy *lp, Seat **seat);
Plug *plug, Conf *conf, Interactor *interactor);
Socket *new_listener(const char *srcaddr, int port, Plug *plug,
bool local_host_only, Conf *conf, int addressfamily);
SockAddr *name_lookup(const char *host, int port, char **canonicalname,
@ -181,8 +176,7 @@ Socket *platform_new_connection(SockAddr *addr, const char *hostname,
Socket *sshproxy_new_connection(SockAddr *addr, const char *hostname,
int port, bool privport,
bool oobinline, bool nodelay, bool keepalive,
Plug *plug, Conf *conf,
LogPolicy *clientlp, Seat **clientseat);
Plug *plug, Conf *conf, Interactor *itr);
/* socket functions */