nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

tentative change: if you have your dirport set, you are a directory

Browse Source 
mirror, whether or not your orport is set.


svn:r6513
This commit is contained in:
Roger Dingledine 2006-05-30 06:11:36 +00:00
parent 1e4923652b
commit 60abe23158
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/or/routerlist.c
View File

@ -1798,7 +1798,7 @@ routerlist_remove_old_routers(void)
retain = digestmap_new();
cutoff = now - OLD_ROUTER_DESC_MAX_AGE;
if (server_mode(options) && options->DirPort) {
if (options->DirPort) {
SMARTLIST_FOREACH(networkstatus_list, networkstatus_t *, ns,
{
SMARTLIST_FOREACH(ns->entries, routerstatus_t *, rs,
@ -2527,10 +2527,10 @@ void
update_networkstatus_downloads(time_t now)
{
or_options_t *options = get_options();
if (server_mode(options) && options->DirPort)
update_networkstatus_cache_downloads(time(NULL));
else
update_networkstatus_client_downloads(time(NULL));
if (options->DirPort)
update_networkstatus_cache_downloads(time(NULL));
else
update_networkstatus_client_downloads(time(NULL));
}
/** Return 1 if all running sufficiently-stable routers will reject
@ -3430,9 +3430,9 @@ update_router_descriptor_client_downloads(time_t now)
int should_delay, n_downloadable;
or_options_t *options = get_options();
if (server_mode(options) && options->DirPort) {
if (options->DirPort) {
log_warn(LD_BUG,
"Called router_descriptor_client_downloads() on a mirror?");
"Called router_descriptor_client_downloads() on a dir mirror?");
}
/* XXX here's another magic 2 that probably should be replaced
@ -3503,9 +3503,9 @@ update_router_descriptor_cache_downloads(time_t now)
int n_download;
or_options_t *options = get_options();
if (!(server_mode(options) && options->DirPort)) {
if (!options->DirPort) {
log_warn(LD_BUG, "Called update_router_descriptor_cache_downloads() "
"on a non-mirror?");
"on a non-dir-mirror?");
}
if (!networkstatus_list || !smartlist_len(networkstatus_list))
@ -3619,7 +3619,7 @@ void
update_router_descriptor_downloads(time_t now)
{
or_options_t *options = get_options();
if (server_mode(options) && options->DirPort) {
if (options->DirPort) {
update_router_descriptor_cache_downloads(now);
} else {
update_router_descriptor_client_downloads(now);