aboutsummaryrefslogtreecommitdiff
path: root/src/or/directory.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-05-12 00:47:00 -0400
committerNick Mathewson <nickm@torproject.org>2011-05-12 00:47:00 -0400
commit6b83b3ba2aff4ba815241c76d712d149f13465e1 (patch)
tree43d8f075554d1362c83e6b9ee139f53fa183ce8b /src/or/directory.c
parentb47f574c1e27b8665e9e2658409645a3831e7aa4 (diff)
downloadtor-6b83b3ba2aff4ba815241c76d712d149f13465e1.tar.gz
tor-6b83b3ba2aff4ba815241c76d712d149f13465e1.zip
bug 3026: do not upload our vote to ourself
Diffstat (limited to 'src/or/directory.c')
-rw-r--r--src/or/directory.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/or/directory.c b/src/or/directory.c
index 8c6581a123..86dcc8db1c 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 "