projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
proxy.c now no longer refers to `cfg'. Instead, each of the three
[u/mdw/putty]
/
proxy.h
diff --git
a/proxy.h
b/proxy.h
index
c74c89c
..
cc11061
100644
(file)
--- a/
proxy.h
+++ b/
proxy.h
@@
-4,8
+4,7
@@
* A proxy layer, if necessary, wedges itself between the
* network code and the higher level backend.
*
* A proxy layer, if necessary, wedges itself between the
* network code and the higher level backend.
*
- * Supported proxies: HTTP CONNECT, generic telnet
- * In progress: SOCKS
+ * Supported proxies: HTTP CONNECT, generic telnet, SOCKS 4 & 5
*/
#ifndef PUTTY_PROXY_H
*/
#ifndef PUTTY_PROXY_H
@@
-17,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;
@@
-80,12
+79,14
@@
struct Socket_proxy_tag {
/* accepting */
void *accepting_sock;
/* accepting */
void *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;
@@
-96,6
+97,7
@@
extern void proxy_activate (Proxy_Socket);
extern int proxy_http_negotiate (Proxy_Socket, int);
extern int proxy_telnet_negotiate (Proxy_Socket, int);
extern int proxy_http_negotiate (Proxy_Socket, int);
extern int proxy_telnet_negotiate (Proxy_Socket, int);
-extern int proxy_socks_negotiate (Proxy_Socket, int);
+extern int proxy_socks4_negotiate (Proxy_Socket, int);
+extern int proxy_socks5_negotiate (Proxy_Socket, int);
#endif
#endif