aboutsummaryrefslogtreecommitdiff
path: root/src/or/routerlist.h
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2011-03-11 04:35:08 -0500
committerNick Mathewson <nickm@torproject.org>2011-04-26 23:54:14 -0400
commit0ad3836f73cbb6f0aa8b643c43e799d69d378aea (patch)
tree2e8169f50e6df50cc9f0f8134976e9aa9c75686a /src/or/routerlist.h
parent5d12495d982d076b74ca2c0c88b78b00d2810e71 (diff)
downloadtor-0ad3836f73cbb6f0aa8b643c43e799d69d378aea.tar
tor-0ad3836f73cbb6f0aa8b643c43e799d69d378aea.tar.gz
If ExitNodes and Exclude{Exit}Nodes overlap, obey Exclude{Exit}Nodes.
Also, ExitNodes are always strict.
Diffstat (limited to 'src/or/routerlist.h')
-rw-r--r--src/or/routerlist.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/routerlist.h b/src/or/routerlist.h
index cd0eb956b..3bbdc42eb 100644
--- a/src/or/routerlist.h
+++ b/src/or/routerlist.h
@@ -175,9 +175,11 @@ int routerset_contains_extendinfo(const routerset_t *set,
void routerset_get_all_routers(smartlist_t *out, const routerset_t *routerset,
const routerset_t *excludeset,
int running_only);
+#if 0
void routersets_get_disjunction(smartlist_t *target, const smartlist_t *source,
const routerset_t *include,
const routerset_t *exclude, int running_only);
+#endif
void routerset_subtract_routers(smartlist_t *out,
const routerset_t *routerset);
char *routerset_to_string(const routerset_t *routerset);