nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 14:23:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

move the clause above the "if bw is too low" check

Browse Source
This commit is contained in:
Roger Dingledine 2011-02-07 23:22:45 -05:00
parent 20b75989ac
commit bcbcda309a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/or/config.c
View File

@ -3368,6 +3368,11 @@ options_validate(or_options_t *old_options, or_options_t *options,
"RelayBandwidthBurst", msg) < 0) "RelayBandwidthBurst", msg) < 0)
return -1; 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 (server_mode(options)) {
if (options->BandwidthRate < ROUTER_REQUIRED_MIN_BANDWIDTH) { if (options->BandwidthRate < ROUTER_REQUIRED_MIN_BANDWIDTH) {
r = tor_snprintf(buf, sizeof(buf), r = tor_snprintf(buf, sizeof(buf),
@ -3399,11 +3404,6 @@ 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) if (options->RelayBandwidthRate > options->RelayBandwidthBurst)
REJECT("RelayBandwidthBurst must be at least equal " REJECT("RelayBandwidthBurst must be at least equal "
"to RelayBandwidthRate."); "to RelayBandwidthRate.");