diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-04-27 14:36:30 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-04-27 14:36:30 -0400 |
| commit | 8b686d98c47226dfc4d7c87d6a472b592135ae07 (patch) | |
| tree | 06df10f204230dc1be42abec946430b8d20f084f /src/or/routerlist.h | |
| parent | 3256627a4548c4977b834cc724689e0e9a960f06 (diff) | |
| parent | 99621bc5a629a81a5a823ce21ac3d967443d0e12 (diff) | |
| download | tor-8b686d98c47226dfc4d7c87d6a472b592135ae07.tar tor-8b686d98c47226dfc4d7c87d6a472b592135ae07.tar.gz | |
Merge maint-0.2.2 for the bug1090-part1-squashed branch
Resolved conflicts in:
doc/tor.1.txt
src/or/circuitbuild.c
src/or/circuituse.c
src/or/connection_edge.c
src/or/connection_edge.h
src/or/directory.c
src/or/rendclient.c
src/or/routerlist.c
src/or/routerlist.h
These were mostly releated to the routerinfo_t->node_t conversion.
Diffstat (limited to 'src/or/routerlist.h')
| -rw-r--r-- | src/or/routerlist.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/or/routerlist.h b/src/or/routerlist.h index bb7a098fd..794fc0c9d 100644 --- a/src/or/routerlist.h +++ b/src/or/routerlist.h @@ -169,6 +169,7 @@ int routerset_parse(routerset_t *target, const char *s, void routerset_union(routerset_t *target, const routerset_t *source); int routerset_is_list(const routerset_t *set); int routerset_needs_geoip(const routerset_t *set); +int routerset_is_empty(const routerset_t *set); int routerset_contains_router(const routerset_t *set, const routerinfo_t *ri, country_t country); int routerset_contains_routerstatus(const routerset_t *set, @@ -176,15 +177,20 @@ int routerset_contains_routerstatus(const routerset_t *set, country_t country); int routerset_contains_extendinfo(const routerset_t *set, const extend_info_t *ei); + int routerset_contains_node(const routerset_t *set, const node_t *node); void routerset_get_all_nodes(smartlist_t *out, const routerset_t *routerset, + const routerset_t *excludeset, int running_only); +#if 0 void routersets_get_node_disjunction(smartlist_t *target, const smartlist_t *source, const routerset_t *include, const routerset_t *exclude, int running_only); +#endif void routerset_subtract_nodes(smartlist_t *out, - const routerset_t *routerset); + const routerset_t *routerset); + char *routerset_to_string(const routerset_t *routerset); int routerset_equal(const routerset_t *old, const routerset_t *new); void routerset_free(routerset_t *routerset); |