a changelog for write limiting. also, disable the "advertise dirport

until we reach our max bandwidth if it's tiny" trick now that we
do the bandwidth self-test on boot.


svn:r9134

1 files changed, 6 insertions, 9 deletions

diff --git a/src/or/router.c b/src/or/router.c
index 0c3ccafe3d..940f462c5a 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -426,15 +426,12 @@ decide_to_advertise_dirport(or_options_t *options, routerinfo_t *router)
     return 0;
   if (!check_whether_dirport_reachable())
     return 0;
-  if (router->bandwidthcapacity >= router->bandwidthrate) {
-    /* check if we might potentially hibernate. */
-    if (options->AccountingMax != 0)
-      return 0;
-    /* also check if we're advertising a small amount, and have
-       a "boring" DirPort. */
-    if (router->bandwidthrate < 50000 && router->dir_port > 1024)
-      return 0;
-  }
+  /* check if we might potentially hibernate. */
+  if (accounting_is_enabled(options))
+    return 0;
+  /* also check if we're advertising a small amount */
+  if (router->bandwidthrate <= 51200)
+    return 0;
 
   /* Sounds like a great idea. Let's publish it. */
   return router->dir_port;