aboutsummaryrefslogtreecommitdiff
path: root/src/or/routerlist.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-07-11 11:21:47 -0400
committerNick Mathewson <nickm@torproject.org>2011-07-11 11:21:47 -0400
commite158f8de4b487450adeb89de204898263f6a87a5 (patch)
tree1fef7d1c700208ead34667200f138088635481b8 /src/or/routerlist.h
parent60832766ac19e8f027455d23254e376042c21ef2 (diff)
downloadtor-e158f8de4b487450adeb89de204898263f6a87a5.tar.gz
tor-e158f8de4b487450adeb89de204898263f6a87a5.zip
Rename and tweak nodelist_add_node_family() to add node
It's very easy for nodelist_add_node_family(sl,node) to accidentally add 'node', and kind of hard to make sure that it omits it. Instead of taking pains to leave 'node' out, let's instead make sure that we always include it. I also rename the function to nodelist_add_node_and_family, and audit its users so that they don't add the node itself any longer, since the function will take care of that for them. Resolves bug 2616, which was not actually a bug.
Diffstat (limited to 'src/or/routerlist.h')
-rw-r--r--src/or/routerlist.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/or/routerlist.h b/src/or/routerlist.h
index 3a8af6fd9d..11290468d8 100644
--- a/src/or/routerlist.h
+++ b/src/or/routerlist.h
@@ -36,7 +36,6 @@ const routerstatus_t *router_pick_trusteddirserver(dirinfo_type_t type,
int router_get_my_share_of_directory_requests(double *v2_share_out,
double *v3_share_out);
void router_reset_status_download_failures(void);
-void routerlist_add_family(smartlist_t *sl, const routerinfo_t *router);
int routers_have_same_or_addr(const routerinfo_t *r1, const routerinfo_t *r2);
int router_nickname_is_in_list(const routerinfo_t *router, const char *list);
const routerinfo_t *routerlist_find_my_routerinfo(void);