diff options
| author | marha <marha@users.sourceforge.net> | 2012-01-24 16:52:31 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-01-24 16:52:31 +0100 |
| commit | dce7b34b9f70d28161082e6187c5cb6ea4079060 (patch) | |
| tree | b3b63b028dfc4e4853f71339390eea6fb3f6cc24 /tools/plink/proxy.h | |
| parent | 6ba4c534507676abe7d7ac415cb113cd40953925 (diff) | |
| parent | 6039fd0faf73c9d6c5b2abf9d824734218ec5eee (diff) | |
| download | vcxsrv-dce7b34b9f70d28161082e6187c5cb6ea4079060.tar.gz vcxsrv-dce7b34b9f70d28161082e6187c5cb6ea4079060.tar.bz2 vcxsrv-dce7b34b9f70d28161082e6187c5cb6ea4079060.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
tools/plink/sshbn.c
Diffstat (limited to 'tools/plink/proxy.h')
| -rw-r--r-- | tools/plink/proxy.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/plink/proxy.h b/tools/plink/proxy.h index 683b2603d..9e64aadd0 100644 --- a/tools/plink/proxy.h +++ b/tools/plink/proxy.h @@ -30,6 +30,7 @@ struct Socket_proxy_tag { bufchain pending_oob_output_data;
int pending_flush;
bufchain pending_input_data;
+ int pending_eof;
#define PROXY_STATE_NEW -1
#define PROXY_STATE_ACTIVE 0
@@ -80,7 +81,7 @@ struct Socket_proxy_tag { OSSocket accepting_sock;
/* configuration, used to look up proxy settings */
- Config cfg;
+ Conf *conf;
/* CHAP transient data */
int chap_num_attributes;
@@ -110,7 +111,7 @@ extern int proxy_socks5_negotiate (Proxy_Socket, int); * This may be reused by local-command proxies on individual
* platforms.
*/
-char *format_telnet_command(SockAddr addr, int port, const Config *cfg);
+char *format_telnet_command(SockAddr addr, int port, Conf *conf);
/*
* These are implemented in cproxy.c or nocproxy.c, depending on
|