[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[or-cvs] r12371: Fix sign error in networkstatus_note_certs_arrived(). (in tor/trunk: . src/or)



Author: nickm
Date: 2007-11-03 22:29:27 -0400 (Sat, 03 Nov 2007)
New Revision: 12371

Modified:
   tor/trunk/
   tor/trunk/ChangeLog
   tor/trunk/src/or/networkstatus.c
Log:
 r14700@tombo:  nickm | 2007-11-03 22:29:21 -0400
 Fix sign error in networkstatus_note_certs_arrived().



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r14700] on d9e39d38-0f13-419c-a857-e10a0ce2aa0c

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2007-11-04 02:06:09 UTC (rev 12370)
+++ tor/trunk/ChangeLog	2007-11-04 02:29:27 UTC (rev 12371)
@@ -67,6 +67,11 @@
       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/networkstatus.c
===================================================================
--- tor/trunk/src/or/networkstatus.c	2007-11-04 02:06:09 UTC (rev 12370)
+++ tor/trunk/src/or/networkstatus.c	2007-11-04 02:29:27 UTC (rev 12371)
@@ -1384,7 +1384,7 @@
 {
   if (consensus_waiting_for_certs) {
     if (networkstatus_check_consensus_signature(
-                                    consensus_waiting_for_certs, 0)<0) {
+                                    consensus_waiting_for_certs, 0)>=0) {
       if (!networkstatus_set_current_consensus(
                                  consensus_waiting_for_certs_body, 0, 1)) {
         tor_free(consensus_waiting_for_certs_body);