torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'maint-0.2.2'

Browse Source
This commit is contained in:
Roger Dingledine
2011-01-15 22:39:15 -05:00
parent 8e9b25e6c7 7699014e1e
commit 4ff97e3775
16 changed files with 193 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/or/connection_or.c
+4 -4
View File
@@ -391,11 +391,11 @@ connection_or_update_token_buckets_helper(or_connection_t *conn, int reset,
* bandwidth parameters in the consensus, but allow local config
* options to override. */
rate = options->PerConnBWRate ? (int)options->PerConnBWRate :
(int)networkstatus_get_param(NULL, "perconnbwrate",
(int)options->BandwidthRate);
networkstatus_get_param(NULL, "perconnbwrate",
(int)options->BandwidthRate, 1, INT32_MAX);
burst = options->PerConnBWBurst ? (int)options->PerConnBWBurst :
(int)networkstatus_get_param(NULL, "perconnbwburst",
(int)options->BandwidthBurst);
networkstatus_get_param(NULL, "perconnbwburst",
(int)options->BandwidthBurst, 1, INT32_MAX);
}
conn->bandwidthrate = rate;