瀏覽代碼

r13396@catbus: nickm | 2007-06-13 15:06:18 -0400
Set vote_digest field prproperly in networkstatus_vote_t, so that it gets conveyed to the consensus correctly.


svn:r10590

Nick Mathewson 18 年之前
父節點
當前提交
3fa9a90243
共有 2 個文件被更改,包括 3 次插入0 次删除
  1. 2 0
      src/or/routerparse.c
  2. 1 0
      src/or/test.c

+ 2 - 0
src/or/routerparse.c

@@ -1883,6 +1883,8 @@ networkstatus_parse_vote_from_string(const char *s, int is_vote)
       if (voter)
       if (voter)
         smartlist_add(ns->voters, voter);
         smartlist_add(ns->voters, voter);
       voter = tor_malloc_zero(sizeof(networkstatus_voter_info_t));
       voter = tor_malloc_zero(sizeof(networkstatus_voter_info_t));
+      if (is_vote)
+        memcpy(voter->vote_digest, ns_digest, DIGEST_LEN);
 
 
       voter->nickname = tor_strdup(tok->args[0]);
       voter->nickname = tor_strdup(tok->args[0]);
       if (strlen(tok->args[1]) != HEX_DIGEST_LEN ||
       if (strlen(tok->args[1]) != HEX_DIGEST_LEN ||

+ 1 - 0
src/or/test.c

@@ -2389,6 +2389,7 @@ test_v3_networkstatus(void)
   test_assert(consensus_text);
   test_assert(consensus_text);
   consensus = networkstatus_parse_vote_from_string(consensus_text, 0);
   consensus = networkstatus_parse_vote_from_string(consensus_text, 0);
   test_assert(consensus);
   test_assert(consensus);
+  // log_notice(LD_GENERAL, "<<%s>>", consensus_text);
 
 
   /* XXXX020 check consensus contents. */
   /* XXXX020 check consensus contents. */