diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-02-08 14:37:02 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-02-08 14:37:02 -0500 |
| commit | d43470ad8a6b82e3d8a5aa0c1beb729fa65859b5 (patch) | |
| tree | 549b5fee5f5749a36dbe3efdcc0d666b18928e5b | |
| parent | 9c7e2cf010856aabfbca042870ec1d5718c30ea4 (diff) | |
| parent | bcbcda309a24ebe9022ad47c023af12877535780 (diff) | |
| download | tor-d43470ad8a6b82e3d8a5aa0c1beb729fa65859b5.tar tor-d43470ad8a6b82e3d8a5aa0c1beb729fa65859b5.tar.gz | |
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
| -rw-r--r-- | changes/bug2470 | 5 | ||||
| -rw-r--r-- | src/or/config.c | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/changes/bug2470 b/changes/bug2470 new file mode 100644 index 000000000..8ff97b7bc --- /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 5aca2256f..eae92b240 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3345,6 +3345,11 @@ options_validate(or_options_t *old_options, or_options_t *options, "PerConnBWBurst", msg) < 0) return -1; + if (options->RelayBandwidthRate && !options->RelayBandwidthBurst) + options->RelayBandwidthBurst = options->RelayBandwidthRate; + if (options->RelayBandwidthBurst && !options->RelayBandwidthRate) + options->RelayBandwidthRate = options->RelayBandwidthBurst; + if (server_mode(options)) { if (options->BandwidthRate < ROUTER_REQUIRED_MIN_BANDWIDTH) { tor_asprintf(msg, @@ -3373,9 +3378,6 @@ 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."); |