From e0952d07735c60cbe420cec74b7e95c8d3eb61f0 Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Fri, 5 Dec 2003 09:51:49 +0000 Subject: 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 --- src/or/directory.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/or/directory.c') diff --git a/src/or/directory.c b/src/or/directory.c index 039ebb7ced..e4ab0ebe55 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -13,6 +13,8 @@ extern or_options_t options; /* command-line and config-file options */ static char fetchstring[] = "GET / HTTP/1.0\r\n\r\n"; static char answerstring[] = "HTTP/1.0 200 OK\r\n\r\n"; +/* XXX the_directory is the same name as a different variable in· + * dirserv.c, are you crazy?? */ static char the_directory[MAX_DIR_SIZE+1]; static int directorylen=0; @@ -120,7 +122,7 @@ int connection_dir_process_inbuf(connection_t *conn) { log_fn(LOG_INFO,"Empty directory. Ignoring."); return -1; } - if(router_get_dir_from_string(the_directory, conn->identity_pkey) < 0){ + if(router_set_routerlist_from_directory(the_directory, conn->identity_pkey) < 0){ log_fn(LOG_INFO,"...but parsing failed. Ignoring."); } else { log_fn(LOG_INFO,"updated routers."); -- cgit v1.2.3-54-g00ecf