diff options
| author | George Kadianakis <desnacked@gmail.com> | 2011-06-14 02:51:59 +0200 |
|---|---|---|
| committer | George Kadianakis <desnacked@gmail.com> | 2011-06-14 02:51:59 +0200 |
| commit | a79bea40d84fd369ef4df950765afc4c635f9b31 (patch) | |
| tree | 711a80ae2de2c1cab591d0cb6d562b0e54e42ee4 /src/or/or.h | |
| parent | 00ec4b2c002928f1a901950e2cc851578f295b1b (diff) | |
| download | tor-a79bea40d84fd369ef4df950765afc4c635f9b31.tar tor-a79bea40d84fd369ef4df950765afc4c635f9b31.tar.gz | |
We now warn the user if a proxy server is not up when we try to connect with it.
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/src/or/or.h b/src/or/or.h index 8cc2af2e8..6f056b24d 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -232,13 +232,24 @@ typedef enum { #define PROXY_SOCKS5 3 /* Proxy client handshake states */ -#define PROXY_HTTPS_WANT_CONNECT_OK 1 -#define PROXY_SOCKS4_WANT_CONNECT_OK 2 -#define PROXY_SOCKS5_WANT_AUTH_METHOD_NONE 3 -#define PROXY_SOCKS5_WANT_AUTH_METHOD_RFC1929 4 -#define PROXY_SOCKS5_WANT_AUTH_RFC1929_OK 5 -#define PROXY_SOCKS5_WANT_CONNECT_OK 6 -#define PROXY_CONNECTED 7 +/* We use a proxy but we haven't even connected to it yet. */ +#define PROXY_INFANT 1 +/* We use an HTTP proxy and we've sent the CONNECT command. */ +#define PROXY_HTTPS_WANT_CONNECT_OK 2 +/* We use a SOCKS4 proxy and we've sent the CONNECT command. */ +#define PROXY_SOCKS4_WANT_CONNECT_OK 3 +/* We use a SOCKS5 proxy and we try to negotiate without + any authentication . */ +#define PROXY_SOCKS5_WANT_AUTH_METHOD_NONE 4 +/* We use a SOCKS5 proxy and we try to negotiate with + Username/Password authentication . */ +#define PROXY_SOCKS5_WANT_AUTH_METHOD_RFC1929 5 +/* We use a SOCKS5 proxy and we just sent our credentials. */ +#define PROXY_SOCKS5_WANT_AUTH_RFC1929_OK 6 +/* We use a SOCKS5 proxy and we just sent our CONNECT command. */ +#define PROXY_SOCKS5_WANT_CONNECT_OK 7 +/* We use a proxy and we CONNECTed successfully!. */ +#define PROXY_CONNECTED 8 /** True iff <b>x</b> is an edge connection. */ #define CONN_IS_EDGE(x) \ |