mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-20 10:12:15 +01:00
Code Issues Projects Releases Wiki Activity

A changelog entry and a bit more documentation for socks-client

Browse Source
This commit is contained in:
Nick Mathewson 2009-08-26 11:34:45 -04:00
parent 707a6bd659
commit c9203749a2
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -2,6 +2,9 @@ Changes in version 0.2.2.1-alpha - 2009-0?-??
o Major features: o Major features:
- Add support for dynamic OpenSSL hardware crypto acceleration engines - Add support for dynamic OpenSSL hardware crypto acceleration engines
via new AccelName and AccelDir options. via new AccelName and AccelDir options.
- Tor now supports tunneling all of its outgoing connections over a SOCKS
proxy, using the SOCKS4Proxy and/or SOCKS5Proxy configuration options.
Code by Christopher Davis.
o New options for gathering stats safely: o New options for gathering stats safely:
- Directories that configure with --enable-dirreq-stats and set - Directories that configure with --enable-dirreq-stats and set

3
src/or/config.c
View File

@ -3533,6 +3533,9 @@ options_validate(or_options_t *old_options, or_options_t *options,
} }
} }
if (options->Socks4Proxy && options->Socks5Proxy)
REJECT("You cannot specify both Socks4Proxy and SOCKS5Proxy");
if (options->Socks5ProxyUsername) { if (options->Socks5ProxyUsername) {
size_t len; size_t len;

16
src/or/or.h
View File

@ -2392,15 +2392,15 @@ typedef struct {
uint16_t HttpsProxyPort; /**< Parsed port for https proxy, if any. */ uint16_t HttpsProxyPort; /**< Parsed port for https proxy, if any. */
char *HttpsProxyAuthenticator; /**< username:password string, if any. */ char *HttpsProxyAuthenticator; /**< username:password string, if any. */
char *Socks4Proxy; char *Socks4Proxy; /**< hostname:port to use as a SOCKS4 proxy, if any. */
tor_addr_t Socks4ProxyAddr; tor_addr_t Socks4ProxyAddr; /**< Derived from Socks4Proxy. */
uint16_t Socks4ProxyPort; uint16_t Socks4ProxyPort; /**< Derived from Socks4Proxy. */
char *Socks5Proxy; char *Socks5Proxy; /**< hostname:port to use as a SOCKS5 proxy, if any. */
tor_addr_t Socks5ProxyAddr; tor_addr_t Socks5ProxyAddr; /**< Derived from Sock5Proxy. */
uint16_t Socks5ProxyPort; uint16_t Socks5ProxyPort; /**< Derived from Socks5Proxy. */
char *Socks5ProxyUsername; char *Socks5ProxyUsername; /**< Username for SOCKS5 authentication, if any */
char *Socks5ProxyPassword; char *Socks5ProxyPassword; /**< Password for SOCKS5 authentication, if any */
/** List of configuration lines for replacement directory authorities. /** List of configuration lines for replacement directory authorities.
* If you just want to replace one class of authority at a time, * If you just want to replace one class of authority at a time,

2
src/or/reasons.c
View File

@ -326,6 +326,7 @@ circuit_end_reason_to_control_string(int reason)
} }
} }
/** Return a string corresponding to a SOCKS4 reponse code. */
const char * const char *
socks4_response_code_to_string(uint8_t code) socks4_response_code_to_string(uint8_t code)
{ {
@ -343,6 +344,7 @@ socks4_response_code_to_string(uint8_t code)
} }
} }
/** Return a string corresponding to a SOCKS5 reponse code. */
const char * const char *
socks5_response_code_to_string(uint8_t code) socks5_response_code_to_string(uint8_t code)
{ {