Avoid going directly to the directory authorities even if you're a

relay, if you haven't found yourself reachable yet or if you've
decided not to advertise your dirport yet. Addresses bug 556.

svn:r13172

diff --git a/ChangeLog b/ChangeLog
index 185e6db85f13ce67d3b53b80b2ceddf8397c61b8..f1372131691cdbbb2d37df8d94d13ebedafdf57c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Changes in version 0.2.0.18-alpha - 2008-01-??
+  o Major features:
+    - Avoid going directly to the directory authorities even if you're a
+      relay, if you haven't found yourself reachable yet or if you've
+      decided not to advertise your dirport yet. Addresses bug 556.
+
+
 Changes in version 0.2.0.17-alpha - 2008-01-17
   o Compile fixes:
     - Make the tor-gencert man page get included correctly in the tarball.

diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index ab0d17d7a990a60ca88c332c5d98cf237fc5feb2..e66cb2aa5b13e26bed29a35449eb9f6aeef0b314 100644 (file)
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -1116,16 +1116,18 @@ dirserv_dump_directory_to_string(char **dir_out,
 int
 directory_fetches_from_authorities(or_options_t *options)
 {
+  routerinfo_t *me;
   if (options->FetchDirInfoEarly)
     return 1;
   if (options->DirPort == 0)
     return 0;
   if (options->BridgeRelay == 1)
     return 0;
-  /* XXX if dirport not advertised, return 0 too */
-  if (!server_mode(options))
+  if (!server_mode(options) || !advertised_server_mode())
     return 0;
-  /* XXX if orport or dirport not reachable, return 0 too */
+  me = router_get_my_routerinfo();
+  if (!me || !me->dir_port)
+    return 0; /* if dirport not advertised, return 0 too */
   return 1;
 }