[or-cvs] r13175: Don't answer "/tor/networkstatus-bridges" directory requests (in tor/trunk: . src/or)

[arma at seul.org]

Author: arma
Date: 2008-01-17 23:51:12 -0500 (Thu, 17 Jan 2008)
New Revision: 13175

Modified:
   tor/trunk/ChangeLog
   tor/trunk/src/or/directory.c
Log:
Don't answer "/tor/networkstatus-bridges" directory requests if
the request isn't encrypted.


Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2008-01-18 04:50:15 UTC (rev 13174)
+++ tor/trunk/ChangeLog	2008-01-18 04:51:12 UTC (rev 13175)
@@ -4,7 +4,11 @@
       relay, if you haven't found yourself reachable yet or if you've
       decided not to advertise your dirport yet. Addresses bug 556.
 
+  o Minor features:
+    - Don't answer "/tor/networkstatus-bridges" directory requests if
+      the request isn't encrypted.
 
+
 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.

Modified: tor/trunk/src/or/directory.c
===================================================================
--- tor/trunk/src/or/directory.c	2008-01-18 04:50:15 UTC (rev 13174)
+++ tor/trunk/src/or/directory.c	2008-01-18 04:51:12 UTC (rev 13175)
@@ -2337,7 +2337,7 @@
         smartlist_add(items, (char*)item);
     } else if (!current && !strcmp(url, "consensus-signatures")) {
       /* XXXX020 the spec says that we should implement
-       * currrent/consensus-signatures too.  Why? */
+       * current/consensus-signatures too.  Why? -NM */
       const char *item;
       if ((item=dirvote_get_pending_detached_signatures()))
         smartlist_add(items, (char*)item);
@@ -2620,6 +2620,7 @@
 
   if (options->BridgeAuthoritativeDir &&
       options->BridgePassword &&
+      connection_dir_is_encrypted(conn) &&
       !strcmp(url,"/tor/networkstatus-bridges")) {
     char *status;
     char decoded[64];