From e68bed87822f2dd1854c46609cd501746297415f Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Thu, 25 Aug 2005 20:54:12 +0000 Subject: [PATCH] Fall back to routerlist instead of descriptor_list when we are a cache. svn:r4837 --- src/or/dirserv.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index c55bc7c2f5..9e7a679e91 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1275,6 +1275,19 @@ dirserv_get_networkstatus_v2(const char **directory, const char *key, void dirserv_get_routerdescs(smartlist_t *descs_out, const char *key) { + smartlist_t *complete_list; + + /* This is annoying. Can we unify these? */ + if (descriptor_list) + complete_list = descriptor_list; + else { + routerlist_t *rlst; + router_get_routerlist(&rlst); + complete_list = rlst->routers; + } + + if (!complete_list) + return; if (!strcmp(key, "/tor/server/all")) { smartlist_add_all(descs_out, descriptor_list);