aboutsummaryrefslogtreecommitdiff
path: root/src/or/directory.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2009-05-31 18:18:54 -0400
committerNick Mathewson <nickm@torproject.org>2009-05-31 21:56:12 -0400
commit16bca35eab81b13d6ec69acaf25e609bf663d037 (patch)
tree6771e1563aaa20e8aadabab16e81f0ab518e9392 /src/or/directory.c
parent74aba2204080dbb0df5c30c712f08f52bb087449 (diff)
downloadtor-16bca35eab81b13d6ec69acaf25e609bf663d037.tar.gz
tor-16bca35eab81b13d6ec69acaf25e609bf663d037.zip
backport r19291, r19292, r19295, r19296: fix dynamic ip relay reachability
Diffstat (limited to 'src/or/directory.c')
-rw-r--r--src/or/directory.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/directory.c b/src/or/directory.c
index 46721e7fc8..9362c210c8 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -635,7 +635,8 @@ directory_command_should_use_begindir(or_options_t *options, uint32_t addr,
return 0; /* We don't know an ORPort -- no chance. */
if (!anonymized_connection)
if (!fascist_firewall_allows_address_or(addr, or_port) ||
- directory_fetches_from_authorities(options))
+ directory_fetches_from_authorities(options) ||
+ (server_mode(options) && !options->Address))
return 0; /* We're firewalled or are acting like a relay -- also no. */
if (!options->TunnelDirConns &&
router_purpose != ROUTER_PURPOSE_BRIDGE)