diff options
| author | Roger Dingledine <arma@torproject.org> | 2011-03-11 04:35:08 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-04-26 23:54:14 -0400 |
| commit | 0ad3836f73cbb6f0aa8b643c43e799d69d378aea (patch) | |
| tree | 2e8169f50e6df50cc9f0f8134976e9aa9c75686a /src/or/routerlist.c | |
| parent | 5d12495d982d076b74ca2c0c88b78b00d2810e71 (diff) | |
| download | tor-0ad3836f73cbb6f0aa8b643c43e799d69d378aea.tar.gz tor-0ad3836f73cbb6f0aa8b643c43e799d69d378aea.zip | |
If ExitNodes and Exclude{Exit}Nodes overlap, obey Exclude{Exit}Nodes.
Also, ExitNodes are always strict.
Diffstat (limited to 'src/or/routerlist.c')
| -rw-r--r-- | src/or/routerlist.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 523596ddda..a9a216b2a1 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -5473,12 +5473,14 @@ routerset_needs_geoip(const routerset_t *set) return set && smartlist_len(set->country_names); } +#if 0 /** Return true iff there are no entries in <b>set</b>. */ static int routerset_is_empty(const routerset_t *set) { return !set || smartlist_len(set->list) == 0; } +#endif /** Helper. Return true iff <b>set</b> contains a router based on the other * provided fields. Return higher values for more specific subentries: a @@ -5594,6 +5596,7 @@ routerset_get_all_routers(smartlist_t *out, const routerset_t *routerset, } } +#if 0 /** Add to <b>target</b> every routerinfo_t from <b>source</b> except: * * 1) Don't add it if <b>include</b> is non-empty and the relay isn't in @@ -5624,6 +5627,7 @@ routersets_get_disjunction(smartlist_t *target, } }); } +#endif /** Remove every routerinfo_t from <b>lst</b> that is in <b>routerset</b>. */ void |