terminology shift:

directory is the string that dirserv.c and directory.c deal with
routerlist is routerinfo's that are bundled together in routers.c

rename some of the get_routerlist functions to set_routerlist

preparing to break into router.c for stuff the router does,
and routerlist.c for handling routerlist.


svn:r886

1 files changed, 3 insertions, 1 deletions

diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 42f1d57fa..ab46d16d7 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -10,6 +10,8 @@
 extern or_options_t options; /* command-line and config-file options */
 
 static int the_directory_is_dirty = 1;
+/* XXX the_directory is the same name as a different variable in 
+ * directory.c, are you crazy?? */
 static char *the_directory = NULL;
 static int the_directory_len = -1;
 
@@ -448,7 +450,7 @@ size_t dirserv_get_directory(const char **directory)
      * necessary, but safe is better than sorry. */
     new_directory = tor_strdup(the_directory);
     /* use a new copy of the dir, since get_dir_from_string scribbles on it */
-    if (router_get_dir_from_string(new_directory, get_identity_key())) {
+    if (router_set_routerlist_from_directory(new_directory, get_identity_key())) {
       log_fn(LOG_ERR, "We just generated a directory we can't parse. Dying.");
       exit(0);
     }