[or-cvs] r10952: Make it so we can actually compile with FULL_V1_DIRECTORIES (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-07-27 19:18:58 -0400 (Fri, 27 Jul 2007)
New Revision: 10952

Modified:
   tor/trunk/
   tor/trunk/src/or/dirserv.c
Log:
 r13951 at catbus:  nickm | 2007-07-27 18:39:28 -0400
 Make it so we can actually compile with FULL_V1_DIRECTORIES disabled.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r13951] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/src/or/dirserv.c
===================================================================
--- tor/trunk/src/or/dirserv.c	2007-07-27 23:18:55 UTC (rev 10951)
+++ tor/trunk/src/or/dirserv.c	2007-07-27 23:18:58 UTC (rev 10952)
@@ -32,6 +32,13 @@
 static int runningrouters_is_dirty = 1;
 static int the_v2_networkstatus_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 = { NULL, NULL, 0, 0, 0, -1 };
+
 static void directory_remove_invalid(void);
 static cached_dir_t *dirserv_regenerate_directory(void);
 static char *format_versions_list(config_line_t *ln);
@@ -962,8 +969,12 @@
   char *buf = NULL;
   size_t buf_len;
   size_t identity_pkey_len;
+  time_t now = time(NULL);
+#ifdef FULL_V1_DIRECTORIES
   routerlist_t *rl = router_get_routerlist();
-  time_t now = time(NULL);
+#else
+  (void)complete;
+#endif
 
   tor_assert(dir_out);
   *dir_out = NULL;
@@ -1059,10 +1070,6 @@
   return -1;
 }
 
-/** Most recently generated encoded signed v1 directory. (v1 auth dirservers
- * only.) */
-static cached_dir_t *the_directory = NULL;
-
 /* Used only by non-v1-auth dirservers: The v1 directory and
  * runningrouters we'll serve when requested. */
 static cached_dir_t *cached_directory = NULL;
@@ -1365,9 +1372,6 @@
   return the_directory;
 }
 
-/** For authoritative directories: the current (v1) network status. */
-static cached_dir_t the_runningrouters = { NULL, NULL, 0, 0, 0, -1 };
-
 /** Only called by v1 auth dirservers.
  * Replace the current running-routers list with a newly generated one. */
 static cached_dir_t *
@@ -1381,7 +1385,9 @@
   crypto_pk_env_t *private_key = get_identity_key();
   char *identity_pkey; /* Identity key, DER64-encoded. */
   size_t identity_pkey_len;
+#ifdef FULL_V1_DIRECTORIES
   routerlist_t *rl = router_get_routerlist();
+#endif
 
 #ifdef FULL_V1_DIRECTORIES
   if (list_server_status(rl->routers, &router_status, 0)) {