[or-cvs] r12365: always use begin_dir for publishing and fetching bridge desc (tor/trunk/src/or)

[arma at seul.org]

Author: arma
Date: 2007-11-03 18:34:31 -0400 (Sat, 03 Nov 2007)
New Revision: 12365

Modified:
   tor/trunk/src/or/directory.c
Log:
always use begin_dir for publishing and fetching bridge
descriptors, no matter our config


Modified: tor/trunk/src/or/directory.c
===================================================================
--- tor/trunk/src/or/directory.c	2007-11-03 22:08:52 UTC (rev 12364)
+++ tor/trunk/src/or/directory.c	2007-11-03 22:34:31 UTC (rev 12365)
@@ -624,7 +624,9 @@
 {
   dir_connection_t *conn;
   or_options_t *options = get_options();
-  int use_begindir = options->TunnelDirConns && supports_begindir && or_port &&
+  int use_begindir = supports_begindir && or_port &&
+                     (options->TunnelDirConns ||
+                      router_purpose == ROUTER_PURPOSE_BRIDGE) &&
                      (anonymized_connection ||
                       fascist_firewall_allows_address_or(addr, or_port));