nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

r15574@catbus: nickm | 2007-10-09 13:01:53 -0400

Browse Source 
Fix the "400 OK" issue when replying to a vote.


svn:r11801
This commit is contained in:
Nick Mathewson 2007-10-09 17:07:13 +00:00
parent 5346a01796
commit c7981e669f
2 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -36,6 +36,9 @@ Changes in version 0.2.0.8-alpha - 2007-??-??
o Minor bugfixes (v3 directory code): o Minor bugfixes (v3 directory code):
- Fix logic to look up a cert by its signing key digest. Bugfix on - Fix logic to look up a cert by its signing key digest. Bugfix on
0.2.0.7-alpha. 0.2.0.7-alpha.
- Only change the reply to a vote to "OK" if it's not already set. This
gets rid of annoying "400 OK" log messages, which may have been masking
some deeper issue. Bugfix on 0.2.0.7-alpha.
o Minor bugfixes (performance): o Minor bugfixes (performance):
- Use a slightly simpler string hashing algorithm (copying Python's - Use a slightly simpler string hashing algorithm (copying Python's

41
src/or/dirvote.c
View File

@ -1350,10 +1350,10 @@ dirvote_add_vote(const char *vote_body, const char **msg_out, int *status_out)
tor_assert(vote_body); tor_assert(vote_body);
tor_assert(msg_out); tor_assert(msg_out);
tor_assert(status_out); tor_assert(status_out);
*status_out = 0;
if (!pending_vote_list) if (!pending_vote_list)
pending_vote_list = smartlist_create(); pending_vote_list = smartlist_create();
*status_out = 0;
*msg_out = NULL; *msg_out = NULL;
again: again:
@ -1411,9 +1411,11 @@ dirvote_add_vote(const char *vote_body, const char **msg_out, int *status_out)
if (!memcmp(vi_old->vote_digest, vi->vote_digest, DIGEST_LEN)) { if (!memcmp(vi_old->vote_digest, vi->vote_digest, DIGEST_LEN)) {
/* Ah, it's the same vote. Not a problem. */ /* Ah, it's the same vote. Not a problem. */
log_info(LD_DIR, "Discarding a vote we already have."); log_info(LD_DIR, "Discarding a vote we already have.");
*status_out = 200; if (*status_out < 200)
*msg_out = "ok"; *status_out = 200;
goto err; if (!*msg_out)
*msg_out = "OK";
goto discard;
} else if (v->vote->published < vote->published) { } else if (v->vote->published < vote->published) {
log_notice(LD_DIR, "Replacing an older pending vote from this " log_notice(LD_DIR, "Replacing an older pending vote from this "
"directory."); "directory.");
@ -1426,9 +1428,10 @@ dirvote_add_vote(const char *vote_body, const char **msg_out, int *status_out)
!strcmpstart(end_of_vote, "network-status-version")) !strcmpstart(end_of_vote, "network-status-version"))
goto again; goto again;
if (!*status_out) if (*status_out < 200)
*status_out = 200; *status_out = 200;
*msg_out = "ok"; if (!*msg_out)
*msg_out = "OK";
return v; return v;
} else { } else {
*msg_out = "Already have a newer pending vote"; *msg_out = "Already have a newer pending vote";
@ -1446,26 +1449,30 @@ dirvote_add_vote(const char *vote_body, const char **msg_out, int *status_out)
if (end_of_vote && !strcmpstart(end_of_vote, "network-status-version ")) if (end_of_vote && !strcmpstart(end_of_vote, "network-status-version "))
goto again; goto again;
if (any_failed) goto done;
goto err;
if (!*status_out)
*status_out = 200;
*msg_out = "ok";
return pending_vote;
err: err:
any_failed = 1; any_failed = 1;
if (vote)
networkstatus_vote_free(vote);
if (!*msg_out) if (!*msg_out)
*msg_out = "Error adding vote"; *msg_out = "Error adding vote";
if (!*status_out || *status_out == 200) if (*status_out < 400)
*status_out = 400; *status_out = 400;
discard:
if (vote)
networkstatus_vote_free(vote);
if (end_of_vote && !strcmpstart(end_of_vote, "network-status-version ")) if (end_of_vote && !strcmpstart(end_of_vote, "network-status-version "))
goto again; goto again;
return NULL;
done:
if (*status_out < 200)
*status_out = 200;
if (!*msg_out)
*msg_out = "ok";
return any_failed ? NULL : pending_vote;
} }
/** Try to compute a v3 networkstatus consensus from the currently pending /** Try to compute a v3 networkstatus consensus from the currently pending