[or-cvs] r11094: Give a 200 when a duplicate vote gets uploaded. (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-08-13 17:01:02 -0400 (Mon, 13 Aug 2007)
New Revision: 11094

Modified:
   tor/trunk/
   tor/trunk/src/or/directory.c
   tor/trunk/src/or/dirvote.c
   tor/trunk/src/or/or.h
Log:
 r14544 at catbus:  nickm | 2007-08-13 17:00:09 -0400
 Give a 200 when a duplicate vote gets uploaded.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r14544] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/src/or/directory.c
===================================================================
--- tor/trunk/src/or/directory.c	2007-08-13 20:45:36 UTC (rev 11093)
+++ tor/trunk/src/or/directory.c	2007-08-13 21:01:02 UTC (rev 11094)
@@ -2161,11 +2161,12 @@
   if (authdir_mode_v3(options) &&
       !strcmp(url,"/tor/post/vote")) { /* server descriptor post */
     const char *msg = "OK";
-    if (dirvote_add_vote(body, &msg)) {
-      write_http_status_line(conn, 200, "Vote stored");
+    int status;
+    if (dirvote_add_vote(body, &msg, &status)) {
+      write_http_status_line(conn, status, "Vote stored");
     } else {
       tor_assert(msg);
-      write_http_status_line(conn, 400, msg);
+      write_http_status_line(conn, status, msg);
     }
     goto done;
   }

Modified: tor/trunk/src/or/dirvote.c
===================================================================
--- tor/trunk/src/or/dirvote.c	2007-08-13 20:45:36 UTC (rev 11093)
+++ tor/trunk/src/or/dirvote.c	2007-08-13 21:01:02 UTC (rev 11094)
@@ -1131,12 +1131,13 @@
 {
   cached_dir_t *new_vote = generate_v3_networkstatus();
   pending_vote_t *pending_vote;
+  int status;
   const char *msg = "";
 
   if (!new_vote)
     return;
 
-  if (!(pending_vote = dirvote_add_vote(new_vote->dir, &msg))) {
+  if (!(pending_vote = dirvote_add_vote(new_vote->dir, &msg, &status))) {
     log_warn(LD_DIR, "Couldn't store my own vote! (I told myself, '%s'.)",
              msg);
     return;
@@ -1171,7 +1172,7 @@
 
 /** DOCDOC */
 pending_vote_t *
-dirvote_add_vote(const char *vote_body, const char **msg_out)
+dirvote_add_vote(const char *vote_body, const char **msg_out, int *status_out)
 {
   networkstatus_vote_t *vote;
   networkstatus_voter_info_t *vi;
@@ -1179,6 +1180,8 @@
   pending_vote_t *pending_vote = NULL;
   tor_assert(vote_body);
   tor_assert(msg_out);
+  tor_assert(status_out);
+  *status_out = 0;
 
   if (!pending_vote_list)
     pending_vote_list = smartlist_create();
@@ -1216,6 +1219,7 @@
         if (!memcmp(vi_old->vote_digest, vi->vote_digest, DIGEST_LEN)) {
           /* Ah, it's the same vote. Not a problem. */
           log_info(LD_DIR, "Discarding a vote we already have.");
+          *status_out = 200;
           *msg_out = "ok";
           goto err;
         } else if (v->vote->published < vote->published) {
@@ -1240,7 +1244,8 @@
                                            vote->published);
   pending_vote->vote = vote;
   smartlist_add(pending_vote_list, pending_vote);
-
+  if (!*status_out)
+    *status_out = 200;
   *msg_out = "ok";
   return pending_vote;
  err:
@@ -1248,6 +1253,8 @@
     networkstatus_vote_free(vote);
   if (!*msg_out)
     *msg_out = "Error adding vote";
+  if (!*status_out)
+    *status_out = 400;
   /*XXXX020 free other fields */
   return NULL;
 }

Modified: tor/trunk/src/or/or.h
===================================================================
--- tor/trunk/src/or/or.h	2007-08-13 20:45:36 UTC (rev 11093)
+++ tor/trunk/src/or/or.h	2007-08-13 21:01:02 UTC (rev 11094)
@@ -2851,7 +2851,8 @@
 void dirvote_perform_vote(void);
 void dirvote_clear_pending_votes(void);
 struct pending_vote_t * dirvote_add_vote(const char *vote_body,
-                                         const char **msg_out);
+                                         const char **msg_out,
+                                         int *status_out);
 int dirvote_compute_consensus(void);
 int dirvote_add_signatures(const char *detached_signatures_body);
 int dirvote_publish_consensus(void);