From 30dd1c87a5ac1ebe7756bb48f7c94cb7f20de1da Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 13 Oct 2004 19:56:42 +0000
Subject: [PATCH] Add default trusted-dir-server entries only when no dirserver
lines are given in the config file
svn:r2467
---
src/or/or.h | 3 ++-
src/or/routerlist.c | 3 +--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/or/or.h b/src/or/or.h
index a15ab6126e..0c614d86a1 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -902,7 +902,6 @@ typedef struct {
struct config_line_t *DirServers; /**< List of configuration lines
* for directory servers. */
-
} or_options_t;
/* XXX are these good enough defaults? */
@@ -1455,6 +1454,8 @@ int router_update_status_from_smartlist(routerinfo_t *r,
time_t list_time,
smartlist_t *running_list);
void add_trusted_dir_server(const char *addr, uint16_t port,const char *digest);
+void clear_trusted_dir_servers(void);
+
/********************************* routerparse.c ************************/
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index a3aa231820..91575d7f1f 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -27,7 +27,6 @@ static trusted_dir_server_t *
router_pick_trusteddirserver_impl(int requireother, int fascistfirewall);
static void mark_all_trusteddirservers_up(void);
static int router_resolve_routerlist(routerlist_t *dir);
-static void clear_trusted_dir_servers(void);
/****************************************************************************/
@@ -1162,7 +1161,7 @@ void add_trusted_dir_server(const char *addr, uint16_t port, const char *digest)
smartlist_add(trusted_dir_servers, ent);
}
-static void clear_trusted_dir_servers(void)
+void clear_trusted_dir_servers(void)
{
if (trusted_dir_servers) {
SMARTLIST_FOREACH(trusted_dir_servers, trusted_dir_server_t *, ent,
--
GitLab