From: Roger Dingledine <arma@torproject.org>
Date: Sat, 22 Dec 2007 09:13:24 +0000 (+0000)
Subject: If the user sets RelayBandwidthRate but doesn't set
X-Git-Tag: tor-0.2.0.14-alpha~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce636beff9bd571e4e15242e164e93b07707f0a7;p=thirdparty%2Ftor.git

If the user sets RelayBandwidthRate but doesn't set
RelayBandwidthBurst, then make them equal rather than erroring out.


svn:r12925
---

diff --git a/ChangeLog b/ChangeLog
index c9603fa831..0df946bdbe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,8 @@ Changes in version 0.2.0.14-alpha - 2007-12-??
   o Minor features:
     - If BridgeRelay is set to 1, then the default for
       PublishServerDescriptor is now "bridge" rather than "v2,v3".
+    - If the user sets RelayBandwidthRate but doesn't set
+      RelayBandwidthBurst, then make them equal rather than erroring out.
 
 
 Changes in version 0.2.0.13-alpha - 2007-12-21
diff --git a/src/or/config.c b/src/or/config.c
index d61cb23f82..1da844aba0 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3016,6 +3016,9 @@ options_validate(or_options_t *old_options, or_options_t *options,
     }
   }
 
+  if (options->RelayBandwidthRate && !options->RelayBandwidthBurst)
+    options->RelayBandwidthBurst = options->RelayBandwidthRate;
+
   if (options->RelayBandwidthRate > options->RelayBandwidthBurst)
     REJECT("RelayBandwidthBurst must be at least equal "
            "to RelayBandwidthRate.");