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

Add default trusted-dir-server entries only when no dirserver lines are given in the config file

Browse Source 
svn:r2467
This commit is contained in:
Nick Mathewson 2004-10-13 19:56:42 +00:00
parent 508970f85d
commit 30dd1c87a5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/or/or.h
View File

@ -902,7 +902,6 @@ typedef struct {
struct config_line_t *DirServers; /**< List of configuration lines struct config_line_t *DirServers; /**< List of configuration lines
* for directory servers. */ * for directory servers. */
} or_options_t; } or_options_t;
/* XXX are these good enough defaults? */ /* XXX are these good enough defaults? */
@ -1455,6 +1454,8 @@ int router_update_status_from_smartlist(routerinfo_t *r,
time_t list_time, time_t list_time,
smartlist_t *running_list); smartlist_t *running_list);
void add_trusted_dir_server(const char *addr, uint16_t port,const char *digest); void add_trusted_dir_server(const char *addr, uint16_t port,const char *digest);
void clear_trusted_dir_servers(void);
/********************************* routerparse.c ************************/ /********************************* routerparse.c ************************/

3
src/or/routerlist.c
View File

@ -27,7 +27,6 @@ static trusted_dir_server_t *
router_pick_trusteddirserver_impl(int requireother, int fascistfirewall); router_pick_trusteddirserver_impl(int requireother, int fascistfirewall);
static void mark_all_trusteddirservers_up(void); static void mark_all_trusteddirservers_up(void);
static int router_resolve_routerlist(routerlist_t *dir); 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); smartlist_add(trusted_dir_servers, ent);
} }
static void clear_trusted_dir_servers(void) void clear_trusted_dir_servers(void)
{ {
if (trusted_dir_servers) { if (trusted_dir_servers) {
SMARTLIST_FOREACH(trusted_dir_servers, trusted_dir_server_t *, ent, SMARTLIST_FOREACH(trusted_dir_servers, trusted_dir_server_t *, ent,