r14392@Kushana: nickm | 2007-09-12 11:04:20 -0400

 Complete implementation of proposal 104: remove bandwidth history lines from router descriptors.


svn:r11434

2 files changed, 1 insertions, 24 deletions

diff --git a/src/or/router.c b/src/or/router.c
index a21d5cb51b..794f5473e1 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -1470,9 +1470,6 @@ router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router,
   size_t written;
   int result=0;
   addr_policy_t *tmpe;
-#ifdef INCLUDE_BW_INFO_IN_ROUTERDESCS
-  char *bandwidth_usage;
-#endif
   char *family_line;
   or_options_t *options = get_options();
 
@@ -1507,11 +1504,6 @@ router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router,
   /* Encode the publication time. */
   format_iso_time(published, router->cache_info.published_on);
 
-#ifdef INCLUDE_BW_INFO_IN_ROUTERDESCS
-  /* How busy have we been? */
-  bandwidth_usage = rep_hist_get_bandwidth_lines(0);
-#endif
-
   if (router->declared_family && smartlist_len(router->declared_family)) {
     size_t n;
     char *family = smartlist_join_strings(router->declared_family, " ", 0, &n);
@@ -1537,7 +1529,7 @@ router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router,
                     "opt extra-info-digest %s\n%s"
                     "onion-key\n%s"
                     "signing-key\n%s"
-                    "%s%s%s",
+                    "%s%s",
     router->nickname,
     router->address,
     router->or_port,
@@ -1553,18 +1545,10 @@ router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router,
     options->DownloadExtraInfo ? "opt caches-extra-info\n" : "",
     onion_pkey, identity_pkey,
     family_line,
-#ifdef INCLUDE_BW_INFO_IN_ROUTERDESCS
-    bandwidth_usage,
-#else
-    "",
-#endif
     we_are_hibernating() ? "opt hibernating 1\n" : "");
   tor_free(family_line);
   tor_free(onion_pkey);
   tor_free(identity_pkey);
-#ifdef INCLUDE_BW_INFO_IN_ROUTERDESCS
-  tor_free(bandwidth_usage);
-#endif
 
   if (result < 0) {
     log_warn(LD_BUG,"descriptor snprintf #1 ran out of room!");
diff --git a/src/or/test.c b/src/or/test.c
index 1635e7c5b4..8503cdb609 100644
--- a/src/or/test.c
+++ b/src/or/test.c
@@ -2067,7 +2067,6 @@ test_dir_format(void)
   addr_policy_t ex1, ex2;
   routerlist_t *dir1 = NULL, *dir2 = NULL;
   tor_version_t ver1;
-  char *bw_lines = NULL;
 
   pk1 = pk_generate(0);
   pk2 = pk_generate(1);
@@ -2154,10 +2153,6 @@ test_dir_format(void)
   r2.exit_policy = &ex1;
   r2.nickname = tor_strdup("Fred");
 
-  bw_lines = rep_hist_get_bandwidth_lines(0);
-  test_assert(bw_lines);
-  test_assert(!strcmpstart(bw_lines, "opt write-history "));
-
   test_assert(!crypto_pk_write_public_key_to_string(pk1, &pk1_str,
                                                     &pk1_str_len));
   test_assert(!crypto_pk_write_public_key_to_string(pk2 , &pk2_str,
@@ -2186,13 +2181,11 @@ test_dir_format(void)
   strlcat(buf2, pk1_str, sizeof(buf2));
   strlcat(buf2, "signing-key\n", sizeof(buf2));
   strlcat(buf2, pk2_str, sizeof(buf2));
-  strlcat(buf2, bw_lines, sizeof(buf2));
   strlcat(buf2, "router-signature\n", sizeof(buf2));
   buf[strlen(buf2)] = '\0'; /* Don't compare the sig; it's never the same
                              * twice */
 
   test_streq(buf, buf2);
-  tor_free(bw_lines);
 
   test_assert(router_dump_router_to_string(buf, 2048, &r1, pk2)>0);
   cp = buf;