projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
I added more detail to the `Authentication failed at PuTTY X11
[u/mdw/putty]
/
proxy.h
diff --git
a/proxy.h
b/proxy.h
index
6e64114
..
8f49e60
100644
(file)
--- a/
proxy.h
+++ b/
proxy.h
@@
-16,7
+16,7
@@
typedef struct Socket_proxy_tag * Proxy_Socket;
struct Socket_proxy_tag {
typedef struct Socket_proxy_tag * Proxy_Socket;
struct Socket_proxy_tag {
- struct socket_function_table *fn;
+
const
struct socket_function_table *fn;
/* the above variable absolutely *must* be the first in this structure */
char * error;
/* the above variable absolutely *must* be the first in this structure */
char * error;
@@
-64,7
+64,7
@@
struct Socket_proxy_tag {
*/
/* closing */
*/
/* closing */
- char *closing_error_msg;
+ c
onst c
har *closing_error_msg;
int closing_error_code;
int closing_calling_back;
int closing_error_code;
int closing_calling_back;
@@
-77,14
+77,16
@@
struct Socket_proxy_tag {
int sent_bufsize;
/* accepting */
int sent_bufsize;
/* accepting */
-
void *
accepting_sock;
+
OSSocket
accepting_sock;
+ /* configuration, used to look up proxy settings */
+ Config cfg;
};
typedef struct Plug_proxy_tag * Proxy_Plug;
struct Plug_proxy_tag {
};
typedef struct Plug_proxy_tag * Proxy_Plug;
struct Plug_proxy_tag {
- struct plug_function_table *fn;
+
const
struct plug_function_table *fn;
/* the above variable absolutely *must* be the first in this structure */
Proxy_Socket proxy_socket;
/* the above variable absolutely *must* be the first in this structure */
Proxy_Socket proxy_socket;
@@
-98,4
+100,10
@@
extern int proxy_telnet_negotiate (Proxy_Socket, int);
extern int proxy_socks4_negotiate (Proxy_Socket, int);
extern int proxy_socks5_negotiate (Proxy_Socket, int);
extern int proxy_socks4_negotiate (Proxy_Socket, int);
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);
+
#endif
#endif