Commit 7d990b5a authored by Nick Mathewson's avatar Nick Mathewson 🐘
Browse files

r13992@Kushana: nickm | 2007-08-13 16:45:22 -0400 

 A vote we already have a nd a double-upload are different things.


svn:r11093
parent b4adf151

src/or/dirvote.c

+9 −2
Changes for src/or/dirvote.c: 9 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -1212,8 +1212,15 @@ dirvote_add_vote(const char *vote_body, const char **msg_out) 
      if (! memcmp(v->vote->cert->cache_info.identity_digest,

                   vote->cert->cache_info.identity_digest,

                   DIGEST_LEN)) {

        log_notice(LD_DIR, "We already have a pending vote from this dir");

        if (v->vote->published < vote->published) {

        networkstatus_voter_info_t *vi_old = smartlist_get(v->vote->voters, 0);

        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.");

          *msg_out = "ok";

          goto err;

        } else if (v->vote->published < vote->published) {

          log_notice(LD_DIR, "Replacing an older pending vote from this "

                     "directory.");

          cached_dir_decref(v->vote_body);

          networkstatus_vote_free(v->vote);

          v->vote_body = new_cached_dir(tor_strdup(vote_body),

src/or/routerlist.c

+1 −1
Changes for src/or/routerlist.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ router_reload_consensus_networkstatus(void) 


  tor_snprintf(filename,sizeof(filename),"%s"PATH_SEPARATOR"cached-consensus",

               get_options()->DataDirectory);

  s = read_file_to_str(filename, RTFS_IGNORE_MISSING, NULL);

  s = read_file_to_str(filename, RFTS_IGNORE_MISSING, NULL);

  if (!s)

    return 0;