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

Clarify some documentation and comments wrt resetting OR token buckets

Browse Source
This commit is contained in:
Nick Mathewson 2011-03-25 17:21:16 -04:00
parent 550749555c
commit d38030381b
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/or/connection_or.c
View File

@ -353,6 +353,9 @@ connection_or_digest_is_known_relay(const char *id_digest)
* per-conn limits that are big enough they'll never matter. But if it's * per-conn limits that are big enough they'll never matter. But if it's
* not a known relay, first check if we set PerConnBwRate/Burst, then * not a known relay, first check if we set PerConnBwRate/Burst, then
* check if the consensus sets them, else default to 'big enough'. * check if the consensus sets them, else default to 'big enough'.
*
* If <b>reset</b> is true, set the bucket to be full. Otherwise, just
* clip the bucket if it happens to be <em>too</em> full.
*/ */
static void static void
connection_or_update_token_buckets_helper(or_connection_t *conn, int reset, connection_or_update_token_buckets_helper(or_connection_t *conn, int reset,
@ -392,7 +395,8 @@ connection_or_update_token_buckets_helper(or_connection_t *conn, int reset,
} }
/** Either our set of relays or our per-conn rate limits have changed. /** Either our set of relays or our per-conn rate limits have changed.
* Go through all the OR connections and update their token buckets. */ * Go through all the OR connections and update their token buckets to make
* sure they don't exceed their maximum values. */
void void
connection_or_update_token_buckets(smartlist_t *conns, or_options_t *options) connection_or_update_token_buckets(smartlist_t *conns, or_options_t *options)
{ {

3
src/or/networkstatus.c
View File

@ -1747,7 +1747,8 @@ networkstatus_set_current_consensus(const char *consensus,
routerstatus_list_update_named_server_map(); routerstatus_list_update_named_server_map();
cell_ewma_set_scale_factor(options, current_consensus); cell_ewma_set_scale_factor(options, current_consensus);
/* XXX022 where is the right place to put this call? */ /* XXXX023 this call might be unnecessary here: can changing the
* current consensus really alter our view of any OR's rate limits? */
connection_or_update_token_buckets(get_connection_array(), options); connection_or_update_token_buckets(get_connection_array(), options);
circuit_build_times_new_consensus_params(&circ_times, current_consensus); circuit_build_times_new_consensus_params(&circ_times, current_consensus);