summaryrefslogtreecommitdiff
path: root/src/or/router.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2005-09-12 06:56:42 +0000
committerNick Mathewson <nickm@torproject.org>2005-09-12 06:56:42 +0000
commit3dc5e77b5867815244e9f37beba56dc995a2fe2b (patch)
tree412299f73e6a108fcd8cfe1f4a5df35e4dd6e7ce /src/or/router.c
parente4272f197839c2a9cc81e29ed28a0b3ce2ce253b (diff)
downloadtor-3dc5e77b5867815244e9f37beba56dc995a2fe2b.tar.gz
tor-3dc5e77b5867815244e9f37beba56dc995a2fe2b.zip
Numerous changes to move towards client-side v2 directories.
connection.c: - Add some more connection accessor functions to make directory download redundancy checking work. directory.c, or.h, router.c, routerlist.c: - Start on logic to note when networkstatus downloads fail. dirserv.c, routerlist.c, routerparse.c: - Start maintaining an is_named field in routerstatus_t. Don't actually look at it yet. dirserv.c, routerlist.c: - Remove expired networkstatus objects. or.h: - Make some booleans into bitfields - Add prototypes routerlist.c: - Sort networkstatus list by publication time - Function to remove old (older than 10 days) networkstatus objects. - Function to set a list of routerinfo_ts' status info from the current set of networkstatus objects. - Function to tell which routerinfos we need to download based no the current set of networkstatus objects. - Do not launch a networkstatus download if a redundant one is in progress. routerparse.c: - Keep router entries in networkstatus sorted by digest. svn:r5012
Diffstat (limited to 'src/or/router.c')
-rw-r--r--src/or/router.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/or/router.c b/src/or/router.c
index d75b6bbcc4..ffb7ffeabd 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -764,10 +764,13 @@ router_rebuild_descriptor(int force)
config_parse_addr_policy(get_options()->ExitPolicy, &ri->exit_policy, -1);
options_append_default_exit_policy(&ri->exit_policy);
- if (desc_routerinfo) /* inherit values */
+ if (desc_routerinfo) { /* inherit values */
ri->is_verified = desc_routerinfo->is_verified;
+ ri->is_running = desc_routerinfo->is_running;
+ ri->is_named = desc_routerinfo->is_named;
+ }
if (authdir_mode(options))
- ri->is_verified = 1; /* believe in yourself */
+ ri->is_verified = ri->is_named = 1; /* believe in yourself */
if (options->MyFamily) {
ri->declared_family = smartlist_create();
smartlist_split_string(ri->declared_family, options->MyFamily, ",",