diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-12 00:47:00 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-12 00:47:00 -0400 |
| commit | 6b83b3ba2aff4ba815241c76d712d149f13465e1 (patch) | |
| tree | 43d8f075554d1362c83e6b9ee139f53fa183ce8b | |
| parent | b47f574c1e27b8665e9e2658409645a3831e7aa4 (diff) | |
| download | tor-6b83b3ba2aff4ba815241c76d712d149f13465e1.tar tor-6b83b3ba2aff4ba815241c76d712d149f13465e1.tar.gz | |
bug 3026: do not upload our vote to ourself
| -rw-r--r-- | changes/bug3026 | 4 | ||||
| -rw-r--r-- | src/or/directory.c | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/changes/bug3026 b/changes/bug3026 new file mode 100644 index 000000000..c0c0a3860 --- /dev/null +++ b/changes/bug3026 @@ -0,0 +1,4 @@ + o Minor bugfixes (directory authority) + - Do not upload our own vote or signature set to ourself. It would + tell us nothing new. Also, as of Tor 0.2.2.24-alpha, we started + to warn about receiving duplicate votes. Resolves bug 3026. diff --git a/src/or/directory.c b/src/or/directory.c index 8c6581a12..86dcc8db1 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -279,6 +279,8 @@ directory_post_to_dirservers(uint8_t dir_purpose, uint8_t router_purpose, int post_via_tor; smartlist_t *dirservers = router_get_trusted_dir_servers(); int found = 0; + const int exclude_self = (dir_purpose == DIR_PURPOSE_UPLOAD_VOTE || + dir_purpose == DIR_PURPOSE_UPLOAD_SIGNATURES); tor_assert(dirservers); /* This tries dirservers which we believe to be down, but ultimately, that's * harmless, and we may as well err on the side of getting things uploaded. @@ -291,6 +293,9 @@ directory_post_to_dirservers(uint8_t dir_purpose, uint8_t router_purpose, if ((type & ds->type) == 0) continue; + if (exclude_self && router_digest_is_me(ds->digest)) + continue; + if (options->ExcludeNodes && options->StrictNodes && routerset_contains_routerstatus(options->ExcludeNodes, rs)) { log_warn(LD_DIR, "Wanted to contact authority '%s' for %s, but " |