[or-cvs] r13926: If we set RelayBandwidthRate and RelayBandwidthBurst very hi (in tor/branches/tor-0_2_0-patches: . doc/spec/proposals src/or)

[arma at seul.org]

Author: arma
Date: 2008-03-10 01:17:46 -0400 (Mon, 10 Mar 2008)
New Revision: 13926

Modified:
   tor/branches/tor-0_2_0-patches/ChangeLog
   tor/branches/tor-0_2_0-patches/doc/spec/proposals/125-bridges.txt
   tor/branches/tor-0_2_0-patches/src/or/config.c
Log:
If we set RelayBandwidthRate and RelayBandwidthBurst very high but
left BandwidthRate and BandwidthBurst at the default, we would be
silently limited by those defaults. Now raise them to match the
RelayBandwidth* values.


Modified: tor/branches/tor-0_2_0-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_2_0-patches/ChangeLog	2008-03-10 01:23:30 UTC (rev 13925)
+++ tor/branches/tor-0_2_0-patches/ChangeLog	2008-03-10 05:17:46 UTC (rev 13926)
@@ -1,3 +1,11 @@
+Changes in version 0.2.0.22-rc - 2008-03-??
+  o Minor bugfixes:
+    - If we set RelayBandwidthRate and RelayBandwidthBurst very high but
+      left BandwidthRate and BandwidthBurst at the default, we would be
+      silently limited by those defaults. Now raise them to match the
+      RelayBandwidth* values.
+
+
 Changes in version 0.2.0.21-rc - 2008-03-02
   o Major bugfixes:
     - The control port should declare that it requires password auth

Modified: tor/branches/tor-0_2_0-patches/doc/spec/proposals/125-bridges.txt
===================================================================
--- tor/branches/tor-0_2_0-patches/doc/spec/proposals/125-bridges.txt	2008-03-10 01:23:30 UTC (rev 13925)
+++ tor/branches/tor-0_2_0-patches/doc/spec/proposals/125-bridges.txt	2008-03-10 05:17:46 UTC (rev 13926)
@@ -42,7 +42,7 @@
   can supply their bridge users with cached copies of all the various
   Tor network information.
 
-  As for Tor 0.2.0.13-alpha, bridges will answer begin_dir questions
+  As of Tor 0.2.0.13-alpha, bridges will answer begin_dir questions
   (and cache dir info they see so the answers will be more useful)
   whether their DirPort is enabled or not. (After all, we don't care if
   they have an open or reachable DirPort to answer begin_dir questions.)

Modified: tor/branches/tor-0_2_0-patches/src/or/config.c
===================================================================
--- tor/branches/tor-0_2_0-patches/src/or/config.c	2008-03-10 01:23:30 UTC (rev 13925)
+++ tor/branches/tor-0_2_0-patches/src/or/config.c	2008-03-10 05:17:46 UTC (rev 13926)
@@ -3117,6 +3117,13 @@
   if (options->BandwidthRate > options->BandwidthBurst)
     REJECT("BandwidthBurst must be at least equal to BandwidthRate.");
 
+  /* if they set relaybandwidth* really high but left bandwidth*
+   * at the default, raise the defaults. */
+  if (options->RelayBandwidthRate > options->BandwidthRate)
+    options->BandwidthRate = options->RelayBandwidthRate;
+  if (options->RelayBandwidthBurst > options->BandwidthBurst)
+    options->BandwidthBurst = options->RelayBandwidthBurst;
+
   if (accounting_parse_options(options, 1)<0)
     REJECT("Failed to parse accounting options. See logs for details.");