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 c9603fa831aa8bd3843e3cd711041c602dcf5ac0..0df946bdbed0ae03b919a6dd35dc9e35567dfe68 100644 (file)
--- 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 d61cb23f82fa2735d7bb1c3f8eaabbbebda8efd0..1da844aba057880cdee74ec44d572b9425b42e82 100644 (file)
--- 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.");