[or-cvs] now we can tell dirserv_dump_directory_to_string() whether ...

[arma at seul.org]

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

Modified Files:
	dirserv.c or.h test.c 
Log Message:
now we can tell dirserv_dump_directory_to_string() whether we want
it to include down/invalid descriptors or not.


Index: dirserv.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/dirserv.c,v
retrieving revision 1.331
retrieving revision 1.332
diff -u -p -d -r1.331 -r1.332
--- dirserv.c	4 Jun 2006 22:42:12 -0000	1.331
+++ dirserv.c	13 Jun 2006 11:11:19 -0000	1.332
@@ -760,11 +760,12 @@ live_enough_for_v1_dir(routerinfo_t *ri,
 /** Generate a new v1 directory and write it into a newly allocated string.
  * Point *<b>dir_out</b> to the allocated string.  Sign the
  * directory with <b>private_key</b>.  Return 0 on success, -1 on
- * failure.
+ * failure. If <b>complete</b> is set, give us all the descriptors;
+ * otherwise leave out non-running and non-valid ones.
  */
 int
 dirserv_dump_directory_to_string(char **dir_out,
-                                 crypto_pk_env_t *private_key)
+                                 crypto_pk_env_t *private_key, int complete)
 {
   char *cp;
   char *router_status;
@@ -798,7 +799,7 @@ dirserv_dump_directory_to_string(char **
   buf_len = 2048+strlen(recommended_versions)+
     strlen(router_status);
   SMARTLIST_FOREACH(rl->routers, routerinfo_t *, ri,
-                    if (live_enough_for_v1_dir(ri, now))
+                    if (complete || live_enough_for_v1_dir(ri, now))
                       buf_len += ri->cache_info.signed_descriptor_len+1);
   buf = tor_malloc(buf_len);
   /* We'll be comparing against buf_len throughout the rest of the
@@ -824,7 +825,7 @@ dirserv_dump_directory_to_string(char **
     {
       size_t len = ri->cache_info.signed_descriptor_len;
       const char *body;
-      if (!live_enough_for_v1_dir(ri, now))
+      if (!complete && !live_enough_for_v1_dir(ri, now))
         continue;
       if (cp+len+1 >= buf+buf_len)
         goto truncated;
@@ -1086,7 +1087,7 @@ dirserv_regenerate_directory(void)
   char *new_directory=NULL;
 
   if (dirserv_dump_directory_to_string(&new_directory,
-                                       get_identity_key())) {
+                                       get_identity_key(), 0)) {
     log_warn(LD_BUG, "Error creating directory.");
     tor_free(new_directory);
     return -1;

Index: or.h
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/or.h,v
retrieving revision 1.839
retrieving revision 1.840
diff -u -p -d -r1.839 -r1.840
--- or.h	13 Jun 2006 09:16:09 -0000	1.839
+++ or.h	13 Jun 2006 11:11:19 -0000	1.840
@@ -1910,7 +1910,8 @@ int dirserv_thinks_router_is_blatantly_u
                                                    time_t now);
 int list_server_status(smartlist_t *routers, char **router_status_out);
 int dirserv_dump_directory_to_string(char **dir_out,
-                                     crypto_pk_env_t *private_key);
+                                     crypto_pk_env_t *private_key,
+                                     int complete);
 void directory_set_dirty(void);
 size_t dirserv_get_directory(const char **cp, int compress);
 size_t dirserv_get_runningrouters(const char **rr, int compress);

Index: test.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/test.c,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -p -d -r1.226 -r1.227
--- test.c	18 Apr 2006 03:07:24 -0000	1.226
+++ test.c	13 Jun 2006 11:11:19 -0000	1.227
@@ -1320,7 +1320,7 @@ test_dir_format(void)
   test_assert(router_dump_router_to_string(buf, 2048, &r2, pk1)>0);
   test_eq(dirserv_add_descriptor(buf,&m), 2);
   get_options()->Nickname = tor_strdup("DirServer");
-  test_assert(!dirserv_dump_directory_to_string(&cp,pk3));
+  test_assert(!dirserv_dump_directory_to_string(&cp,pk3, 0));
   crypto_pk_get_digest(pk3, d);
   test_assert(!router_parse_directory(cp));
   test_eq(2, smartlist_len(dir1->routers));