diff options
author | Roger Dingledine <arma@torproject.org> | 2004-06-30 21:48:02 +0000 |
---|---|---|
committer | Roger Dingledine <arma@torproject.org> | 2004-06-30 21:48:02 +0000 |
commit | f42f04c859a68dab45d021dd4197da816ec72b07 (patch) | |
tree | be4634b8becfc47b80be3e6c83d8127a26badea3 /src/or/dirserv.c | |
parent | 29818d5b6bccce2d4e6678cce82ebdefa47883bb (diff) | |
download | tor-f42f04c859a68dab45d021dd4197da816ec72b07.tar.gz tor-f42f04c859a68dab45d021dd4197da816ec72b07.zip |
cleanups on 008pre1 items
svn:r1993
Diffstat (limited to 'src/or/dirserv.c')
-rw-r--r-- | src/or/dirserv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 8252ee077b..77b5f2a7a0 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -455,6 +455,7 @@ list_running_servers(char **nicknames_out) continue; /* only list successfully handshaked OR's. */ if(!conn->nickname) /* it's an OP, don't list it */ continue; + /* XXX008 need to change this to list "!nickname" for down routers */ if (!router_nickname_is_approved(conn->nickname)) continue; /* If we removed them from the approved list, don't list it.*/ smartlist_add(nicknames, conn->nickname); @@ -580,7 +581,7 @@ dirserv_dump_directory_to_string(char *s, unsigned int maxlen, /** Most recently generated encoded signed directory. */ static char *the_directory = NULL; static int the_directory_len = -1; -static char *cached_directory = NULL; +static char *cached_directory = NULL; /* used only by non-auth dirservers */ static time_t cached_directory_published = 0; static int cached_directory_len = -1; @@ -588,8 +589,7 @@ void dirserv_set_cached_directory(const char *directory, time_t when) { time_t now; char filename[512]; - if (!options.AuthoritativeDir) - return; + tor_assert(!options.AuthoritativeDir); now = time(NULL); if (when>cached_directory_published && when<now+ROUTER_ALLOW_SKEW) { |