From c024928b63ac41d722d5dd8b8ef7a305ca10fae2 Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Sat, 11 Apr 2009 19:40:42 +0000 Subject: For belt-and-suspenders, relays that don't set Address in their config now avoid using begin_dir for all direct connections. svn:r19296 --- src/or/directory.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/or/directory.c') diff --git a/src/or/directory.c b/src/or/directory.c index 8117dc5f0e..c72061a9f9 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -681,7 +681,8 @@ directory_command_should_use_begindir(or_options_t *options, 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) -- cgit v1.2.3-54-g00ecf