diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-07-07 11:52:13 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-07-07 11:52:13 -0400 |
| commit | 64c8e8edda5a7f3525a1ab365c4bd72b19212322 (patch) | |
| tree | f332a7c68897a39b81976bc9b0392e5e81848013 /src/or/directory.c | |
| parent | 174cbff8cf855dc1bbf690694f539ba3f85a508c (diff) | |
| download | tor-64c8e8edda5a7f3525a1ab365c4bd72b19212322.tar tor-64c8e8edda5a7f3525a1ab365c4bd72b19212322.tar.gz | |
Kill redundant checks around routerset_contains_*()
All of the routerset_contains*() functions return 0 if their
routerset_t argument is NULL. Therefore, there's no point in
doing "if (ExcludeNodes && routerset_contains*(ExcludeNodes...))",
for example.
This patch fixes every instance of
if (X && routerstatus_contains*(X,...))
Note that there are other patterns that _aren't_ redundant. For
example, we *don't* want to change:
if (EntryNodes && !routerstatus_contains(EntryNodes,...))
Fixes #2797. No bug here; just needless code.
Diffstat (limited to 'src/or/directory.c')
| -rw-r--r-- | src/or/directory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/directory.c b/src/or/directory.c index 9e1373d46..17413edeb 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -306,7 +306,7 @@ directory_post_to_dirservers(uint8_t dir_purpose, uint8_t router_purpose, if (exclude_self && router_digest_is_me(ds->digest)) continue; - if (options->ExcludeNodes && options->StrictNodes && + if (options->StrictNodes && routerset_contains_routerstatus(options->ExcludeNodes, rs, -1)) { log_warn(LD_DIR, "Wanted to contact authority '%s' for %s, but " "it's in our ExcludedNodes list and StrictNodes is set. " |