Merge remote-tracking branch 'karsten/task-11070'

1 files changed, 0 insertions, 258 deletions

diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 7393a80ad..234209d21 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -42,28 +42,10 @@
  * directory authorities. */
 #define MAX_UNTRUSTED_NETWORKSTATUSES 16
 
-/** If a v1 directory is older than this, discard it. */
-#define MAX_V1_DIRECTORY_AGE (30*24*60*60)
-/** If a v1 running-routers is older than this, discard it. */
-#define MAX_V1_RR_AGE (7*24*60*60)
-
 extern time_t time_of_process_start; /* from main.c */
 
 extern long stats_n_seconds_working; /* from main.c */
 
-/** Do we need to regenerate the v1 directory when someone asks for it? */
-static time_t the_directory_is_dirty = 1;
-/** Do we need to regenerate the v1 runningrouters document when somebody
- * asks for it? */
-static time_t runningrouters_is_dirty = 1;
-
-/** Most recently generated encoded signed v1 directory. (v1 auth dirservers
- * only.) */
-static cached_dir_t *the_directory = NULL;
-
-/** For authoritative directories: the current (v1) network status. */
-static cached_dir_t the_runningrouters;
-
 /** Total number of routers with measured bandwidth; this is set by
  * dirserv_count_measured_bws() before the loop in
  * dirserv_generate_networkstatus_vote_obj() and checked by
@@ -72,7 +54,6 @@ static cached_dir_t the_runningrouters;
 static int routers_with_measured_bw = 0;
 
 static void directory_remove_invalid(void);
-static cached_dir_t *dirserv_regenerate_directory(void);
 static char *format_versions_list(config_line_t *ln);
 struct authdir_config_t;
 static int add_fingerprint_to_dir(const char *nickname, const char *fp,
@@ -827,7 +808,6 @@ dirserv_add_extrainfo(extrainfo_t *ei, const char **msg)
 static void
 directory_remove_invalid(void)
 {
-  int changed = 0;
   routerlist_t *rl = router_get_routerlist();
   smartlist_t *nodes = smartlist_new();
   smartlist_add_all(nodes, nodelist_get_list());
@@ -845,7 +825,6 @@ directory_remove_invalid(void)
       log_info(LD_DIRSERV, "Router %s is now rejected: %s",
                description, msg?msg:"");
       routerlist_remove(rl, ent, 0, time(NULL));
-      changed = 1;
       continue;
     }
 #if 0
@@ -854,70 +833,35 @@ directory_remove_invalid(void)
                "Router %s is now %snamed.", description,
                (r&FP_NAMED)?"":"un");
       ent->is_named = (r&FP_NAMED)?1:0;
-      changed = 1;
     }
     if (bool_neq((r & FP_UNNAMED), ent->auth_says_is_unnamed)) {
       log_info(LD_DIRSERV,
                "Router '%s' is now %snamed. (FP_UNNAMED)", description,
                (r&FP_NAMED)?"":"un");
       ent->is_named = (r&FP_NUNAMED)?0:1;
-      changed = 1;
     }
 #endif
     if (bool_neq((r & FP_INVALID), !node->is_valid)) {
       log_info(LD_DIRSERV, "Router '%s' is now %svalid.", description,
                (r&FP_INVALID) ? "in" : "");
       node->is_valid = (r&FP_INVALID)?0:1;
-      changed = 1;
     }
     if (bool_neq((r & FP_BADDIR), node->is_bad_directory)) {
       log_info(LD_DIRSERV, "Router '%s' is now a %s directory", description,
                (r & FP_BADDIR) ? "bad" : "good");
       node->is_bad_directory = (r&FP_BADDIR) ? 1: 0;
-      changed = 1;
     }
     if (bool_neq((r & FP_BADEXIT), node->is_bad_exit)) {
       log_info(LD_DIRSERV, "Router '%s' is now a %s exit", description,
                (r & FP_BADEXIT) ? "bad" : "good");
       node->is_bad_exit = (r&FP_BADEXIT) ? 1: 0;
-      changed = 1;
     }
   } SMARTLIST_FOREACH_END(node);
-  if (changed)
-    directory_set_dirty();
 
   routerlist_assert_ok(rl);
   smartlist_free(nodes);
 }
 
-/** Mark the directory as <b>dirty</b> -- when we're next asked for a
- * directory, we will rebuild it instead of reusing the most recently
- * generated one.
- */
-void
-directory_set_dirty(void)
-{
-  time_t now = time(NULL);
-  int set_v1_dirty=0;
-
-  /* Regenerate stubs only every 8 hours.
-   * XXXX It would be nice to generate less often, but these are just
-   * stubs: it doesn't matter. */
-#define STUB_REGENERATE_INTERVAL (8*60*60)
-  if (!the_directory || !the_runningrouters.dir)
-    set_v1_dirty = 1;
-  else if (the_directory->published < now - STUB_REGENERATE_INTERVAL ||
-           the_runningrouters.published < now - STUB_REGENERATE_INTERVAL)
-    set_v1_dirty = 1;
-
-  if (set_v1_dirty) {
-    if (!the_directory_is_dirty)
-      the_directory_is_dirty = now;
-    if (!runningrouters_is_dirty)
-      runningrouters_is_dirty = now;
-  }
-}
-
 /**
  * Allocate and return a description of the status of the server <b>desc</b>,
  * for use in a v1-style router-status line.  The server is listed
@@ -1306,51 +1250,10 @@ directory_too_idle_to_fetch_descriptors(const or_options_t *options,
 
 /********************************************************************/
 
-/* Used only by non-v1-auth dirservers: The v1 directory and
- * runningrouters we'll serve when requested. */
-
-/** The v1 directory we'll serve (as a cache or as an authority) if
- * requested. */
-static cached_dir_t *cached_directory = NULL;
-/** The v1 runningrouters document we'll serve (as a cache or as an authority)
- * if requested. */
-static cached_dir_t cached_runningrouters;
-
 /** Map from flavor name to the cached_dir_t for the v3 consensuses that we're
  * currently serving. */
 static strmap_t *cached_consensuses = NULL;
 
-/** Possibly replace the contents of <b>d</b> with the value of
- * <b>directory</b> published on <b>when</b>, unless <b>when</b> is older than
- * the last value, or too far in the future.
- *
- * Does not copy <b>directory</b>; frees it if it isn't used.
- */
-static void
-set_cached_dir(cached_dir_t *d, char *directory, time_t when)
-{
-  time_t now = time(NULL);
-  if (when<=d->published) {
-    log_info(LD_DIRSERV, "Ignoring old directory; not caching.");
-    tor_free(directory);
-  } else if (when>=now+ROUTER_MAX_AGE_TO_PUBLISH) {
-    log_info(LD_DIRSERV, "Ignoring future directory; not caching.");
-    tor_free(directory);
-  } else {
-    /* if (when>d->published && when<now+ROUTER_MAX_AGE) */
-    log_debug(LD_DIRSERV, "Caching directory.");
-    tor_free(d->dir);
-    d->dir = directory;
-    d->dir_len = strlen(directory);
-    tor_free(d->dir_z);
-    if (tor_gzip_compress(&(d->dir_z), &(d->dir_z_len), d->dir, d->dir_len,
-                          ZLIB_METHOD)) {
-      log_warn(LD_BUG,"Error compressing cached directory");
-    }
-    d->published = when;
-  }
-}
-
 /** Decrement the reference count on <b>d</b>, and free it if it no longer has
  * any references. */
 void
@@ -1400,22 +1303,6 @@ free_cached_dir_(void *_d)
   cached_dir_decref(d);
 }
 
-/** If we have no cached v1 directory, or it is older than <b>published</b>,
- * then replace it with <b>directory</b>, published at <b>published</b>.
- *
- * If <b>published</b> is too old, do nothing.
- *
- * If <b>is_running_routers</b>, this is really a v1 running_routers
- * document rather than a v1 directory.
- */
-static void
-dirserv_set_cached_directory(const char *directory, time_t published)
-{
-
-  cached_dir_decref(cached_directory);
-  cached_directory = new_cached_dir(tor_strdup(directory), published);
-}
-
 /** Replace the v3 consensus networkstatus of type <b>flavor_name</b> that
  * we're serving with <b>networkstatus</b>, published at <b>published</b>.  No
  * validation is performed. */
@@ -1438,146 +1325,6 @@ dirserv_set_cached_consensus_networkstatus(const char *networkstatus,
     cached_dir_decref(old_networkstatus);
 }
 
-/** Helper: If we're an authority for the right directory version (v1)
- * (based on <b>auth_type</b>), try to regenerate
- * auth_src as appropriate and return it, falling back to cache_src on
- * failure.  If we're a cache, simply return cache_src.
- */
-static cached_dir_t *
-dirserv_pick_cached_dir_obj(cached_dir_t *cache_src,
-                            cached_dir_t *auth_src,
-                            time_t dirty, cached_dir_t *(*regenerate)(void),
-                            const char *name,
-                            dirinfo_type_t auth_type)
-{
-  const or_options_t *options = get_options();
-  int authority = (auth_type == V1_DIRINFO && authdir_mode_v1(options));
-
-  if (!authority || authdir_mode_bridge(options)) {
-    return cache_src;
-  } else {
-    /* We're authoritative. */
-    if (regenerate != NULL) {
-      if (dirty && dirty + DIR_REGEN_SLACK_TIME < time(NULL)) {
-        if (!(auth_src = regenerate())) {
-          log_err(LD_BUG, "Couldn't generate %s?", name);
-          exit(1);
-        }
-      } else {
-        log_info(LD_DIRSERV, "The %s is still clean; reusing.", name);
-      }
-    }
-    return auth_src ? auth_src : cache_src;
-  }
-}
-
-/** Return the most recently generated encoded signed v1 directory,
- * generating a new one as necessary.  If not a v1 authoritative directory
- * may return NULL if no directory is yet cached. */
-cached_dir_t *
-dirserv_get_directory(void)
-{
-  return dirserv_pick_cached_dir_obj(cached_directory, the_directory,
-                                     the_directory_is_dirty,
-                                     dirserv_regenerate_directory,
-                                     "v1 server directory", V1_DIRINFO);
-}
-
-/** Only called by v1 auth dirservers.
- * Generate a fresh v1 directory; set the_directory and return a pointer
- * to the new value.
- */
-static cached_dir_t *
-dirserv_regenerate_directory(void)
-{
-  /* XXXX 024 Get rid of this function if we can confirm that nobody's
-   * fetching these any longer */
-  char *new_directory=NULL;
-
-  if (dirserv_dump_directory_to_string(&new_directory,
-                                       get_server_identity_key())) {
-    log_warn(LD_BUG, "Error creating directory.");
-    tor_free(new_directory);
-    return NULL;
-  }
-  cached_dir_decref(the_directory);
-  the_directory = new_cached_dir(new_directory, time(NULL));
-  log_info(LD_DIRSERV,"New directory (size %d) has been built.",
-           (int)the_directory->dir_len);
-  log_debug(LD_DIRSERV,"New directory (size %d):\n%s",
-            (int)the_directory->dir_len, the_directory->dir);
-
-  the_directory_is_dirty = 0;
-
-  /* Save the directory to disk so we re-load it quickly on startup.
-   */
-  dirserv_set_cached_directory(the_directory->dir, time(NULL));
-
-  return the_directory;
-}
-
-/** Only called by v1 auth dirservers.
- * Replace the current running-routers list with a newly generated one. */
-static cached_dir_t *
-generate_runningrouters(void)
-{
-  char *s=NULL;
-  char digest[DIGEST_LEN];
-  char published[ISO_TIME_LEN+1];
-  size_t len;
-  crypto_pk_t *private_key = get_server_identity_key();
-  char *identity_pkey; /* Identity key, DER64-encoded. */
-  size_t identity_pkey_len;
-
-  if (crypto_pk_write_public_key_to_string(private_key,&identity_pkey,
-                                           &identity_pkey_len)<0) {
-    log_warn(LD_BUG,"write identity_pkey to string failed!");
-    goto err;
-  }
-  format_iso_time(published, time(NULL));
-
-  len = 2048;
-  s = tor_malloc_zero(len);
-  tor_snprintf(s, len,
-               "network-status\n"
-               "published %s\n"
-               "router-status %s\n"
-               "dir-signing-key\n%s"
-               "directory-signature %s\n",
-               published, "", identity_pkey,
-               get_options()->Nickname);
-  tor_free(identity_pkey);
-  if (router_get_runningrouters_hash(s,digest)) {
-    log_warn(LD_BUG,"couldn't compute digest");
-    goto err;
-  }
-  note_crypto_pk_op(SIGN_DIR);
-  if (router_append_dirobj_signature(s, len, digest, DIGEST_LEN,
-                                     private_key)<0)
-    goto err;
-
-  set_cached_dir(&the_runningrouters, s, time(NULL));
-  runningrouters_is_dirty = 0;
-
-  return &the_runningrouters;
- err:
-  tor_free(s);
-  return NULL;
-}
-
-/** Set *<b>rr</b> to the most recently generated encoded signed
- * running-routers list, generating a new one as necessary.  Return the
- * size of the directory on success, and 0 on failure. */
-cached_dir_t *
-dirserv_get_runningrouters(void)
-{
-  return dirserv_pick_cached_dir_obj(
-                         &cached_runningrouters, &the_runningrouters,
-                         runningrouters_is_dirty,
-                         generate_runningrouters,
-                         "v1 network status list", V1_DIRINFO);
-}
-
 /** Return the latest downloaded consensus networkstatus in encoded, signed,
  * optionally compressed format, suitable for sending to clients. */
 cached_dir_t *
@@ -3733,11 +3480,6 @@ dirserv_free_all(void)
 {
   dirserv_free_fingerprint_list();
 
-  cached_dir_decref(the_directory);
-  clear_cached_dir(&the_runningrouters);
-  cached_dir_decref(cached_directory);
-  clear_cached_dir(&cached_runningrouters);
-
   strmap_free(cached_consensuses, free_cached_dir_);
   cached_consensuses = NULL;