[or-cvs] strip obsolete code

arma at seul.org arma at seul.org
Thu Sep 8 05:32:44 UTC 2005


Update of /home2/or/cvsroot/tor/src/or
In directory moria:/home/arma/work/onion/cvs/tor/src/or

Modified Files:
	router.c 
Log Message:
strip obsolete code


Index: router.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/router.c,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -d -r1.202 -r1.203
--- router.c	7 Sep 2005 16:42:53 -0000	1.202
+++ router.c	8 Sep 2005 05:32:41 -0000	1.203
@@ -371,22 +371,6 @@
     add_trusted_dir_server(NULL, (uint16_t)options->DirPort, digest,
                            options->V1AuthoritativeDir);
   }
-#if 0
-  /* 7. [authdirserver only] load old directory, if it's there */
-  tor_snprintf(keydir,sizeof(keydir),"%s/cached-directory", datadir);
-  log_fn(LOG_INFO,"Loading cached directory from \"%s\"...",keydir);
-  cp = read_file_to_str(keydir,0);
-  if (!cp) {
-    log_fn(LOG_INFO,"Cached directory \"%s\" not present. Ok.",keydir);
-  } else {
-    if (dirserv_load_from_directory_string(cp) < 0) {
-      log_fn(LOG_WARN, "Cached directory \"%s\" is corrupt, only loaded part of it.", keydir);
-      tor_free(cp);
-      return 0;
-    }
-    tor_free(cp);
-  }
-#endif
   /* success */
   return 0;
 }



More information about the tor-commits mailing list