diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-01-26 11:35:24 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-01-26 11:35:24 -0500 |
| commit | d92a415bedd5220be05f3556007bf29ef18bd2f5 (patch) | |
| tree | 960ce03bd56c5eaded80be93f01b2a74210e6e51 /src/or/connection_edge.c | |
| parent | 411ec3c0f8cd4786233a3bc274cb2b766d4bfe7c (diff) | |
| download | tor-d92a415bedd5220be05f3556007bf29ef18bd2f5.tar.gz tor-d92a415bedd5220be05f3556007bf29ef18bd2f5.zip | |
Add an option to disable the block-private-addresses feature
Suggested by rransom. Probably necessary for testing network mode.
Diffstat (limited to 'src/or/connection_edge.c')
| -rw-r--r-- | src/or/connection_edge.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index a85943f69f..47e9035e90 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1659,7 +1659,8 @@ connection_ap_handshake_rewrite_and_attach(edge_connection_t *conn, connection_mark_unattached_ap(conn, END_STREAM_REASON_TORPROTOCOL); return -1; } - if (!conn->use_begindir && !conn->chosen_exit_name && !circ) { + if (options->ClientRejectInternalAddresses && + !conn->use_begindir && !conn->chosen_exit_name && !circ) { tor_addr_t addr; if (tor_addr_from_str(&addr, socks->address) >= 0 && tor_addr_is_internal(&addr, 0)) { |