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

Cleaner fix for get_effective_bw(rate|burst), with comment on why it is ok.

Browse Source
This commit is contained in:
Nick Mathewson 2009-07-30 10:14:12 -04:00
parent 0f944e496a
commit 4577bda766
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/or/config.c
View File

@ -1227,12 +1227,14 @@ options_need_geoip_info(or_options_t *options, const char **reason_out)
uint32_t uint32_t
get_effective_bwrate(or_options_t *options) get_effective_bwrate(or_options_t *options)
{ {
uint32_t bw = (int)options->BandwidthRate; uint64_t bw = options->BandwidthRate;
if (bw > options->MaxAdvertisedBandwidth) if (bw > options->MaxAdvertisedBandwidth)
bw = (int)options->MaxAdvertisedBandwidth; bw = options->MaxAdvertisedBandwidth;
if (options->RelayBandwidthRate > 0 && bw > options->RelayBandwidthRate) if (options->RelayBandwidthRate > 0 && bw > options->RelayBandwidthRate)
bw = (int)options->RelayBandwidthRate; bw = options->RelayBandwidthRate;
return bw;
/* ensure_bandwidth_cap() makes sure that this cast can't overflow. */
return (uint32_t)bw;
} }
/** Return the bandwidthburst that we are going to report to the authorities /** Return the bandwidthburst that we are going to report to the authorities
@ -1240,10 +1242,11 @@ get_effective_bwrate(or_options_t *options)
uint32_t uint32_t
get_effective_bwburst(or_options_t *options) get_effective_bwburst(or_options_t *options)
{ {
uint32_t bw = (int)options->BandwidthBurst; uint64_t bw = options->BandwidthBurst;
if (options->RelayBandwidthBurst > 0 && bw > options->RelayBandwidthBurst) if (options->RelayBandwidthBurst > 0 && bw > options->RelayBandwidthBurst)
bw = (int)options->RelayBandwidthBurst; bw = options->RelayBandwidthBurst;
return bw; /* ensure_bandwidth_cap() makes sure that this cast can't overflow. */
return (uint32_t)bw;
} }
/** Fetch the active option list, and take actions based on it. All of the /** Fetch the active option list, and take actions based on it. All of the