[or-cvs] r19296: {tor} For belt-and-suspenders, relays that don't set Address in th (in tor/trunk: . src/or)

[arma at seul.org]

Author: arma
Date: 2009-04-11 15:40:42 -0400 (Sat, 11 Apr 2009)
New Revision: 19296

Modified:
   tor/trunk/ChangeLog
   tor/trunk/src/or/directory.c
Log:
For belt-and-suspenders, relays that don't set Address in their config
now avoid using begin_dir for all direct connections.


Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2009-04-11 19:22:38 UTC (rev 19295)
+++ tor/trunk/ChangeLog	2009-04-11 19:40:42 UTC (rev 19296)
@@ -7,11 +7,12 @@
 
   o Major bugfixes (on 0.2.0):
     - Finally fix the bug where dynamic-IP relays disappear when their
-      IP address changes: directory mirrors were mistakenly telling them
-      their old address if they asked via begin_dir, so they never got
-      an accurate answer about their new address, so they just vanished
-      after a day. Should fix bugs 827, 883, and 900 -- but alas, only
-      after every directory mirror has upgraded.
+      IP address changes: directory mirrors were mistakenly telling
+      them their old address if they asked via begin_dir, so they
+      never got an accurate answer about their new address, so they
+      just vanished after a day. For belt-and-suspenders, relays that
+      don't set Address in their config now avoid using begin_dir for
+      all direct connections. Should fix bugs 827, 883, and 900.
     - Relays were falling out of the networkstatus consensus for
       part of a day if they changed their local config but the
       authorities discarded their new descriptor as "not sufficiently

Modified: tor/trunk/src/or/directory.c
===================================================================
--- tor/trunk/src/or/directory.c	2009-04-11 19:22:38 UTC (rev 19295)
+++ tor/trunk/src/or/directory.c	2009-04-11 19:40:42 UTC (rev 19296)
@@ -681,7 +681,8 @@
     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)