r14015@Kushana: nickm | 2007-08-14 12:39:04 -0400

 Try to avoid adding duplicate signatures to a consensus.

svn:r11105

diff --git a/src/or/directory.c b/src/or/directory.c
index a9adc48c3cc6a883ab7cc3aab70265287e9cb4f3..83c5721fe2e34bc791f11440c808430c2f9a36fb 100644 (file)
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -1415,7 +1415,7 @@ connection_dir_client_reached_eof(dir_connection_t *conn)
   if (conn->_base.purpose == DIR_PURPOSE_UPLOAD_SIGNATURES) {
     switch (status_code) {
       case 200: {
-        log_notice(LD_DIR,"Uploaded a signatures to dirserver %s:%d",
+        log_notice(LD_DIR,"Uploaded signature(s) to dirserver %s:%d",
                    conn->_base.address, conn->_base.port);
         }
         break;

diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index d22d73eee5f39bc602f0488d5fa83355de3de086..0846772eda39a2f04eba4b1617465bf56c168fd2 100644 (file)
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -803,8 +803,12 @@ networkstatus_add_signatures_impl(networkstatus_vote_t *target,
           networkstatus_check_voter_signature(target, src_voter, cert);
         }
       }
-      /* If this signature is good, then replace and add. */
-      if (src_voter->good_signature || !target_voter->signature) {
+      /* XXXX020 We want to add signatures for which we don't have the cert,
+       * pending the arrival of the cert information.  But this means we need
+       * to replace them if a better one comes along, and that's not
+       * implemented yet. */
+      /* If this signature is good, then add it. */
+      if (src_voter->good_signature) {
         tor_free(target_voter->signature);
         target_voter->signature =
           tor_memdup(src_voter->signature, src_voter->signature_len);
@@ -1325,6 +1329,9 @@ dirvote_compute_consensus(void)
     log_warn(LD_DIR, "Couldn't parse consensus we generated!");
     goto err;
   }
+  /* 'Check' our own signature, to mark it valid. */
+  networkstatus_check_consensus_signature(consensus);
+
   signatures = networkstatus_get_detached_signatures(consensus);
   if (!signatures) {
     log_warn(LD_DIR, "Couldn't extract signatures.");

diff --git a/src/or/test.c b/src/or/test.c
index e082bbfa9c3acbd5eb18f30148f0446bb693b1f1..f2e38537c2746b8f680198cc4f1cbab9b64f37ba 100644 (file)
--- a/src/or/test.c
+++ b/src/or/test.c
@@ -2790,6 +2790,9 @@ test_v3_networkstatus(void)
     */
     test_eq(2, smartlist_len(dsig2->signatures));
 
+    /* Try adding to con2 twice; verify that nothing changes. */
+    test_eq(0, networkstatus_add_detached_signatures(con2, dsig1, &addition2));
+
     /* Add to con. */
     test_eq(2, networkstatus_add_detached_signatures(con, dsig2, &addition2));
     /* Check signatures */