[or-cvs] r11089: Fix some simple logic errors in voting. (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-08-13 16:05:25 -0400 (Mon, 13 Aug 2007)
New Revision: 11089

Modified:
   tor/trunk/
   tor/trunk/src/or/dirserv.c
   tor/trunk/src/or/dirvote.c
Log:
 r13985 at Kushana:  nickm | 2007-08-13 16:05:07 -0400
 Fix some simple logic errors in voting.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r13985] on c95137ef-5f19-0410-b913-86e773d04f59

Modified: tor/trunk/src/or/dirserv.c
===================================================================
--- tor/trunk/src/or/dirserv.c	2007-08-13 19:55:08 UTC (rev 11088)
+++ tor/trunk/src/or/dirserv.c	2007-08-13 20:05:25 UTC (rev 11089)
@@ -2221,7 +2221,6 @@
       cached_dir_decref(*ns_ptr);
     *ns_ptr = new_cached_dir(status, now);
     status = NULL; /* So it doesn't get double-freed. */
-    router_set_networkstatus((*ns_ptr)->dir, now, NS_GENERATED, NULL);
   }
 
   return the_v3_networkstatus_vote;

Modified: tor/trunk/src/or/dirvote.c
===================================================================
--- tor/trunk/src/or/dirvote.c	2007-08-13 19:55:08 UTC (rev 11088)
+++ tor/trunk/src/or/dirvote.c	2007-08-13 20:05:25 UTC (rev 11089)
@@ -1064,7 +1064,8 @@
     dist_delay = consensus->dist_seconds;
   } else {
     /* XXXX020 is this correct according the the spec? */
-    interval = 3600;
+    /* XXXX020 drop this back down to 60 minutes, or whatever the spec says. */
+    interval = 1200;
     vote_delay = dist_delay = 300;
   }
 
@@ -1132,7 +1133,10 @@
   pending_vote_t *pending_vote;
   const char *msg = "";
 
-  if ((pending_vote = dirvote_add_vote(new_vote->dir, &msg))) {
+  if (!new_vote)
+    return;
+
+  if (!(pending_vote = dirvote_add_vote(new_vote->dir, &msg))) {
     log_warn(LD_DIR, "Couldn't store my own vote! (I told myself, '%s'.)",
              msg);
     return;