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.


svn:r13926

ChangeLog

@@ -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

doc/spec/proposals/125-bridges.txt

@@ -42,7 +42,7 @@ Status: Finished
   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.)

src/or/config.c

@@ -3117,6 +3117,13 @@ options_validate(or_options_t *old_options, or_options_t *options,
   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.");