mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-20 10:12:15 +01:00
Code Issues Projects Releases Wiki Activity

r13090@catbus: nickm | 2007-05-30 03:17:57 -0400

Browse Source 
If the user makes a torrc that exceeds the bandwidth cap by one byte, let them have it.


svn:r10411
This commit is contained in:
Nick Mathewson 2007-05-30 07:18:00 +00:00
parent 8b1e9398a8
commit 1cb1ebbfe0
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -119,6 +119,8 @@ Changes in version 0.2.0.1-alpha - 2007-??-??
patterns can be reconfigured with AutomapHostsSuffixes. patterns can be reconfigured with AutomapHostsSuffixes.
- If Tor is invoked from something that isn't a shell (e.g. Vidalia), - If Tor is invoked from something that isn't a shell (e.g. Vidalia),
now we expand "-f ~/.tor/torrc" correctly. Suggested by Matt Edman. now we expand "-f ~/.tor/torrc" correctly. Suggested by Matt Edman.
- Treat "2gb" when given in torrc for a bandwidth as meaning 2gb, minus 1
byte: the actual maximum declared bandwidth.
o Removed features: o Removed features:
- Removed support for the old binary "version 0" controller protocol. - Removed support for the old binary "version 0" controller protocol.

21
src/or/config.c
View File

@ -2322,13 +2322,18 @@ validate_ports_csv(smartlist_t *sl, const char *name, char **msg)
* Else return 0. * Else return 0.
*/ */
static int static int
ensure_bandwidth_cap(uint64_t value, const char *desc, char **msg) ensure_bandwidth_cap(uint64_t *value, const char *desc, char **msg)
{ {
int r; int r;
char buf[1024]; char buf[1024];
if (value > ROUTER_MAX_DECLARED_BANDWIDTH) { if (*value == ROUTER_MAX_DECLARED_BANDWIDTH) {
/* This handles an understandable special case where somebody says "2gb"
* whereas our actual maximum is 2gb-1 (INT_MAX) */
--*value;
}
if (*value > ROUTER_MAX_DECLARED_BANDWIDTH) {
r = tor_snprintf(buf, sizeof(buf), "%s ("U64_FORMAT") must be at most %d", r = tor_snprintf(buf, sizeof(buf), "%s ("U64_FORMAT") must be at most %d",
desc, U64_PRINTF_ARG(value), desc, U64_PRINTF_ARG(*value),
ROUTER_MAX_DECLARED_BANDWIDTH); ROUTER_MAX_DECLARED_BANDWIDTH);
*msg = tor_strdup(r >= 0 ? buf : "internal error"); *msg = tor_strdup(r >= 0 ? buf : "internal error");
return -1; return -1;
@ -2761,19 +2766,19 @@ options_validate(or_options_t *old_options, or_options_t *options,
if (options->KeepalivePeriod < 1) if (options->KeepalivePeriod < 1)
REJECT("KeepalivePeriod option must be positive."); REJECT("KeepalivePeriod option must be positive.");
if (ensure_bandwidth_cap(options->BandwidthRate, if (ensure_bandwidth_cap(&options->BandwidthRate,
"BandwidthRate", msg) < 0) "BandwidthRate", msg) < 0)
return -1; return -1;
if (ensure_bandwidth_cap(options->BandwidthBurst, if (ensure_bandwidth_cap(&options->BandwidthBurst,
"BandwidthBurst", msg) < 0) "BandwidthBurst", msg) < 0)
return -1; return -1;
if (ensure_bandwidth_cap(options->MaxAdvertisedBandwidth, if (ensure_bandwidth_cap(&options->MaxAdvertisedBandwidth,
"MaxAdvertisedBandwidth", msg) < 0) "MaxAdvertisedBandwidth", msg) < 0)
return -1; return -1;
if (ensure_bandwidth_cap(options->RelayBandwidthRate, if (ensure_bandwidth_cap(&options->RelayBandwidthRate,
"RelayBandwidthRate", msg) < 0) "RelayBandwidthRate", msg) < 0)
return -1; return -1;
if (ensure_bandwidth_cap(options->RelayBandwidthBurst, if (ensure_bandwidth_cap(&options->RelayBandwidthBurst,
"RelayBandwidthBurst", msg) < 0) "RelayBandwidthBurst", msg) < 0)
return -1; return -1;