[or-cvs] [tor/release-0.2.2] dtrt when only relaybandwidthburst is set

[arma at torproject.org]

commit 20b75989acb457e5a2f931f8ad74517f885940ed
Author: Roger Dingledine <arma at torproject.org>
Date:   Mon Feb 7 23:21:33 2011 -0500

    dtrt when only relaybandwidthburst is set
    
    fixes bug 2470
---
 changes/bug2470 |    5 +++++
 src/or/config.c |    2 ++
 2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/changes/bug2470 b/changes/bug2470
new file mode 100644
index 0000000..8ff97b7
--- /dev/null
+++ b/changes/bug2470
@@ -0,0 +1,5 @@
+  o Major bugfixes:
+    - If relays set RelayBandwidthBurst but not RelayBandwidthRate,
+      Tor would ignore their RelayBandwidthBurst setting,
+      potentially using more bandwidth than expected. Bugfix on
+      0.2.0.1-alpha. Reported by Paul Wouters. Fixes bug 2470.
diff --git a/src/or/config.c b/src/or/config.c
index f8cfd29..8066a23 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3401,6 +3401,8 @@ options_validate(or_options_t *old_options, or_options_t *options,
 
   if (options->RelayBandwidthRate && !options->RelayBandwidthBurst)
     options->RelayBandwidthBurst = options->RelayBandwidthRate;
+  if (options->RelayBandwidthBurst && !options->RelayBandwidthRate)
+    options->RelayBandwidthRate = options->RelayBandwidthBurst;
 
   if (options->RelayBandwidthRate > options->RelayBandwidthBurst)
     REJECT("RelayBandwidthBurst must be at least equal "