[or-cvs] r12372: add the other v3 dir bugfixes. my bridge is now working agai (in tor/trunk: . src/or)

[arma at seul.org]

Author: arma
Date: 2007-11-03 22:36:09 -0400 (Sat, 03 Nov 2007)
New Revision: 12372

Modified:
   tor/trunk/ChangeLog
   tor/trunk/src/or/directory.c
   tor/trunk/src/or/routerlist.c
Log:
add the other v3 dir bugfixes. my bridge is now working
again even when my datadir starts empty. phew.


Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2007-11-04 02:29:27 UTC (rev 12371)
+++ tor/trunk/ChangeLog	2007-11-04 02:36:09 UTC (rev 12372)
@@ -18,6 +18,18 @@
       maybe in other situations too). Bugfix on 0.2.0.9-alpha; reported
       by Fabian Keil.
 
+  o Major bugfixes (v3 dir, bugfixes on 0.2.0.9-alpha):
+    - Consider replacing the current consensus when certificates arrive
+      that make the pending consensus valid.  Previously, we were only
+      considering replacement when the new certs _didn't_ help.
+    - Fix an assert error on startup if we didn't already have the
+      consensus and certs cached in our datadirectory: we were caching
+      the consensus in consensus_waiting_for_certs but then free'ing it
+      right after.
+    - Avoid sending a request for "keys/fp" (for which we'll get a 400 Bad
+      Request) if we need more v3 certs but we've already got pending
+      requests for all of them.
+
   o New requirements:
     - Drop support for OpenSSL version 0.9.6.  Just about nobody was using
       it, it had no AES, and it hasn't seen any security patches since
@@ -67,11 +79,6 @@
       the Tor process. Patch from Marco Bonetti with tweaks from Mike
       Perry.
 
-  o Major bugfixes:
-    - Consider replace the current consensus when certificates arrive
-      that make the pending consensus valid.  Previously, we were only
-      considering replacement when the new certs _didn't_ help.
-
   o Minor bugfixes:
     - Refuse to start if both ORPort and UseBridges are set. Bugfix
       on 0.2.0.x.

Modified: tor/trunk/src/or/directory.c
===================================================================
--- tor/trunk/src/or/directory.c	2007-11-04 02:29:27 UTC (rev 12371)
+++ tor/trunk/src/or/directory.c	2007-11-04 02:36:09 UTC (rev 12372)
@@ -670,6 +670,8 @@
                                dir_port)) {
       case -1:
         connection_dir_request_failed(conn); /* retry if we want */
+        /* XXX we only pass 'conn' above, not 'resource', 'payload',
+         * etc. So in many situations it can't retry! -RD */
         connection_free(TO_CONN(conn));
         return;
       case 1:

Modified: tor/trunk/src/or/routerlist.c
===================================================================
--- tor/trunk/src/or/routerlist.c	2007-11-04 02:29:27 UTC (rev 12371)
+++ tor/trunk/src/or/routerlist.c	2007-11-04 02:36:09 UTC (rev 12372)
@@ -3911,7 +3911,8 @@
 
   if (should_delay_dir_fetches(get_options())) {
     log_notice(LD_DIR, "no known bridge descriptors running yet; stalling");
-    strlcpy(dir_info_status, "No bridge descriptors.",sizeof(dir_info_status));
+    strlcpy(dir_info_status, "No live bridge descriptors.",
+            sizeof(dir_info_status));
     res = 0;
     goto done;
   }