mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-01-09 17:38:00 +00:00
Pass an Interactor to platform_new_connection.
This will mean that platform-specific proxy types will also be able to set themselves up as child Interactors and prompt the user interactively for passwords and the like. NFC: nothing uses the new parameter yet.
This commit is contained in:
parent
4944b4ddd5
commit
48b7ef21a1
@ -195,7 +195,7 @@ SockAddr *name_lookup(const char *host, int port, char **canonicalname,
|
|||||||
Socket *platform_new_connection(SockAddr *addr, const char *hostname,
|
Socket *platform_new_connection(SockAddr *addr, const char *hostname,
|
||||||
int port, bool privport,
|
int port, bool privport,
|
||||||
bool oobinline, bool nodelay, bool keepalive,
|
bool oobinline, bool nodelay, bool keepalive,
|
||||||
Plug *plug, Conf *conf);
|
Plug *plug, Conf *conf, Interactor *itr);
|
||||||
|
|
||||||
/* callback for SSH jump-host proxying */
|
/* callback for SSH jump-host proxying */
|
||||||
Socket *sshproxy_new_connection(SockAddr *addr, const char *hostname,
|
Socket *sshproxy_new_connection(SockAddr *addr, const char *hostname,
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
Socket *platform_new_connection(SockAddr *addr, const char *hostname,
|
Socket *platform_new_connection(SockAddr *addr, const char *hostname,
|
||||||
int port, int privport,
|
int port, int privport,
|
||||||
int oobinline, int nodelay, int keepalive,
|
int oobinline, int nodelay, int keepalive,
|
||||||
Plug *plug, Conf *conf)
|
Plug *plug, Conf *conf, Interactor *itr)
|
||||||
{
|
{
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
@ -486,7 +486,7 @@ Socket *new_connection(SockAddr *addr, const char *hostname,
|
|||||||
|
|
||||||
if ((sret = platform_new_connection(addr, hostname, port, privport,
|
if ((sret = platform_new_connection(addr, hostname, port, privport,
|
||||||
oobinline, nodelay, keepalive,
|
oobinline, nodelay, keepalive,
|
||||||
plug, conf)) != NULL)
|
plug, conf, itr)) != NULL)
|
||||||
return sret;
|
return sret;
|
||||||
|
|
||||||
ps = snew(ProxySocket);
|
ps = snew(ProxySocket);
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
Socket *platform_new_connection(SockAddr *addr, const char *hostname,
|
Socket *platform_new_connection(SockAddr *addr, const char *hostname,
|
||||||
int port, bool privport,
|
int port, bool privport,
|
||||||
bool oobinline, bool nodelay, bool keepalive,
|
bool oobinline, bool nodelay, bool keepalive,
|
||||||
Plug *plug, Conf *conf)
|
Plug *plug, Conf *conf, Interactor *itr)
|
||||||
{
|
{
|
||||||
char *cmd;
|
char *cmd;
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
Socket *platform_new_connection(SockAddr *addr, const char *hostname,
|
Socket *platform_new_connection(SockAddr *addr, const char *hostname,
|
||||||
int port, bool privport,
|
int port, bool privport,
|
||||||
bool oobinline, bool nodelay, bool keepalive,
|
bool oobinline, bool nodelay, bool keepalive,
|
||||||
Plug *plug, Conf *conf)
|
Plug *plug, Conf *conf, Interactor *itr)
|
||||||
{
|
{
|
||||||
char *cmd;
|
char *cmd;
|
||||||
HANDLE us_to_cmd, cmd_from_us;
|
HANDLE us_to_cmd, cmd_from_us;
|
||||||
|
Loading…
Reference in New Issue
Block a user