October 2012 - tor-commits - lists.torproject.org

[tor/master] Implement cell_ewma_enabled()
by andrea＠torproject.org 11 Oct '12

11 Oct '12

commit 0c4f717b3e83e86fc8646d3803c1e435c6af246d Author: Andrea Shepard <andrea(a)torproject.org> Date: Mon Oct 1 20:08:36 2012 -0700 Implement cell_ewma_enabled() --- src/or/circuitmux_ewma.c | 8 ++++++++ src/or/circuitmux_ewma.h | 1 + 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/src/or/circuitmux_ewma.c b/src/or/circuitmux_ewma.c index 6d4fcc9..c918d6f 100644 --- a/src/or/circuitmux_ewma.c +++ b/src/or/circuitmux_ewma.c @@ -520,6 +520,7 @@ cell_ewma_to_circuit(cell_ewma_t *ewma) * * These tick values are not meant to be shared between Tor instances, or used * for other purposes. */ + static unsigned cell_ewma_tick_from_timeval(const struct timeval *now, double *remainder_out) @@ -532,6 +533,13 @@ cell_ewma_tick_from_timeval(const struct timeval *now, return res; } +/** Tell the caller whether ewma_enabled is set */ +int +cell_ewma_enabled(void) +{ + return ewma_enabled; +} + /** Compute and return the current cell_ewma tick. */ unsigned int cell_ewma_get_tick(void) diff --git a/src/or/circuitmux_ewma.h b/src/or/circuitmux_ewma.h index 0968461..eec16f3 100644 --- a/src/or/circuitmux_ewma.h +++ b/src/or/circuitmux_ewma.h @@ -20,6 +20,7 @@ extern circuitmux_policy_t ewma_policy; #endif /* !(_TOR_CIRCUITMUX_EWMA_C) */ /* Externally visible EWMA functions */ +int cell_ewma_enabled(void); unsigned int cell_ewma_get_tick(void); void cell_ewma_set_scale_factor(const or_options_t *options, const networkstatus_t *consensus);

1 0

[tor/master] Set circuitmux policy on new channels in channeltls.c
by andrea＠torproject.org 11 Oct '12

11 Oct '12

commit bb62281ba48d946e2f948a9c3088f1d0ca481d57 Author: Andrea Shepard <andrea(a)torproject.org> Date: Mon Oct 1 20:27:01 2012 -0700 Set circuitmux policy on new channels in channeltls.c --- src/or/channeltls.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/or/channeltls.c b/src/or/channeltls.c index bc7e3ec..764de80 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -17,6 +17,7 @@ #include "channel.h" #include "channeltls.h" #include "circuitmux.h" +#include "circuitmux_ewma.h" #include "config.h" #include "connection.h" #include "connection_or.h" @@ -129,7 +130,9 @@ channel_tls_connect(const tor_addr_t *addr, uint16_t port, channel_mark_outgoing(chan); chan->cmux = circuitmux_alloc(); - /* TODO set cmux policy */ + if (cell_ewma_enabled()) { + circuitmux_set_policy(chan->cmux, &ewma_policy); + } /* Set up or_connection stuff */ tlschan->conn = connection_or_connect(addr, port, id_digest, tlschan); @@ -262,7 +265,9 @@ channel_tls_handle_incoming(or_connection_t *orconn) channel_mark_incoming(chan); chan->cmux = circuitmux_alloc(); - /* TODO set cmux policy */ + if (cell_ewma_enabled()) { + circuitmux_set_policy(chan->cmux, &ewma_policy); + } /* If we got one, we should register it */ if (chan) channel_register(chan);

1 0

[tor/master] Correctly set magic numbers on ewma policy data/circuit data when allocating
by andrea＠torproject.org 11 Oct '12

11 Oct '12

commit c9607694c971a1f77531437ec61dc38c7d5d9ee3 Author: Andrea Shepard <andrea(a)torproject.org> Date: Mon Oct 1 20:30:33 2012 -0700 Correctly set magic numbers on ewma policy data/circuit data when allocating --- src/or/circuitmux_ewma.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/or/circuitmux_ewma.c b/src/or/circuitmux_ewma.c index c918d6f..9c26e1b 100644 --- a/src/or/circuitmux_ewma.c +++ b/src/or/circuitmux_ewma.c @@ -226,6 +226,7 @@ ewma_alloc_cmux_data(circuitmux_t *cmux) tor_assert(cmux); pol = tor_malloc_zero(sizeof(*pol)); + pol->_base.magic = EWMA_POL_DATA_MAGIC; pol->active_circuit_pqueue = smartlist_new(); pol->active_circuit_pqueue_last_recalibrated = cell_ewma_get_tick(); @@ -278,6 +279,7 @@ ewma_alloc_circ_data(circuitmux_t *cmux, pol = TO_EWMA_POL_DATA(pol_data); cdata = tor_malloc_zero(sizeof(*cdata)); + cdata->_base.magic = EWMA_POL_CIRC_DATA_MAGIC; cdata->circ = circ; /*

1 0

[tor/master] Set circuitmux policy on existing active channels when ewma_enabled changes
by andrea＠torproject.org 11 Oct '12

11 Oct '12

commit 9d615cc5c0a645060781797b23a73df158a1dfb6 Author: Andrea Shepard <andrea(a)torproject.org> Date: Mon Oct 1 20:27:51 2012 -0700 Set circuitmux policy on existing active channels when ewma_enabled changes --- src/or/config.c | 11 +++++++++++ src/or/networkstatus.c | 16 +++++++++++++++- 2 files changed, 26 insertions(+), 1 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index babbfb0..81528c8 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -12,6 +12,7 @@ #define CONFIG_PRIVATE #include "or.h" +#include "channel.h" #include "circuitbuild.h" #include "circuitlist.h" #include "circuitmux.h" @@ -1169,6 +1170,7 @@ options_act(const or_options_t *old_options) char *msg=NULL; const int transition_affects_workers = old_options && options_transition_affects_workers(old_options, options); + int old_ewma_enabled; /* disable ptrace and later, other basic debugging techniques */ { @@ -1376,8 +1378,17 @@ options_act(const or_options_t *old_options) connection_bucket_init(); #endif + old_ewma_enabled = cell_ewma_enabled(); /* Change the cell EWMA settings */ cell_ewma_set_scale_factor(options, networkstatus_get_latest_consensus()); + /* If we just enabled ewma, set the cmux policy on all active channels */ + if (cell_ewma_enabled() && !old_ewma_enabled) { + channel_set_cmux_policy_everywhere(&ewma_policy); + } else if (!cell_ewma_enabled() && old_ewma_enabled) { + /* Turn it off everywhere */ + channel_set_cmux_policy_everywhere(NULL); + } + /* Update the BridgePassword's hashed version as needed. We store this as a * digest so that we can do side-channel-proof comparisons on it. diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 619099b..0f6161e 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -11,6 +11,7 @@ */ #include "or.h" +#include "channel.h" #include "circuitbuild.h" #include "circuitmux.h" #include "circuitmux_ewma.h" @@ -1636,6 +1637,7 @@ networkstatus_set_current_consensus(const char *consensus, consensus_waiting_for_certs_t *waiting = NULL; time_t current_valid_after = 0; int free_consensus = 1; /* Free 'c' at the end of the function */ + int old_ewma_enabled; if (flav < 0) { /* XXXX we don't handle unrecognized flavors yet. */ @@ -1829,7 +1831,19 @@ networkstatus_set_current_consensus(const char *consensus, dirvote_recalculate_timing(options, now); routerstatus_list_update_named_server_map(); - cell_ewma_set_scale_factor(options, current_consensus); + + /* Update ewma and adjust policy if needed; first cache the old value */ + old_ewma_enabled = cell_ewma_enabled(); + /* Change the cell EWMA settings */ + cell_ewma_set_scale_factor(options, networkstatus_get_latest_consensus()); + /* If we just enabled ewma, set the cmux policy on all active channels */ + if (cell_ewma_enabled() && !old_ewma_enabled) { + channel_set_cmux_policy_everywhere(&ewma_policy); + } else if (!cell_ewma_enabled() && old_ewma_enabled) { + /* Turn it off everywhere */ + channel_set_cmux_policy_everywhere(NULL); + } + /* XXXX024 this call might be unnecessary here: can changing the * current consensus really alter our view of any OR's rate limits? */

1 0

[tor/master] Don't remove circuitmux hash table entries in circuitmux_detach_circuit() until after circuitmux_make_circuit_inactive()
by andrea＠torproject.org 11 Oct '12

11 Oct '12

commit bec776480d673dc85afd2a3db052f3d8eb81a5c4 Author: Andrea Shepard <andrea(a)torproject.org> Date: Sat Oct 6 05:45:24 2012 -0700 Don't remove circuitmux hash table entries in circuitmux_detach_circuit() until after circuitmux_make_circuit_inactive() --- src/or/circuitmux.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/or/circuitmux.c b/src/or/circuitmux.c index 44d736a..6a6fa6d 100644 --- a/src/or/circuitmux.c +++ b/src/or/circuitmux.c @@ -1019,7 +1019,7 @@ circuitmux_detach_circuit(circuitmux_t *cmux, circuit_t *circ) if (circ->n_chan) { search.chan_id = circ->n_chan->global_identifier; search.circ_id = circ->n_circ_id; - hashent = HT_REMOVE(chanid_circid_muxinfo_map, cmux->chanid_circid_map, + hashent = HT_FIND(chanid_circid_muxinfo_map, cmux->chanid_circid_map, &search); last_searched_direction = CELL_DIRECTION_OUT; } @@ -1030,7 +1030,7 @@ circuitmux_detach_circuit(circuitmux_t *cmux, circuit_t *circ) search.circ_id = TO_OR_CIRCUIT(circ)->p_circ_id; if (TO_OR_CIRCUIT(circ)->p_chan) { search.chan_id = TO_OR_CIRCUIT(circ)->p_chan->global_identifier; - hashent = HT_REMOVE(chanid_circid_muxinfo_map, + hashent = HT_FIND(chanid_circid_muxinfo_map, cmux->chanid_circid_map, &search); last_searched_direction = CELL_DIRECTION_IN; @@ -1038,7 +1038,10 @@ circuitmux_detach_circuit(circuitmux_t *cmux, circuit_t *circ) } } - /* If hashent isn't NULL, we just removed it from the map */ + /* + * If hashent isn't NULL, we have a circuit to detach; don't remove it from + * the map until later of circuitmux_make_circuit_inactive() breaks. + */ if (hashent) { /* Update counters */ --(cmux->n_circuits); @@ -1068,6 +1071,9 @@ circuitmux_detach_circuit(circuitmux_t *cmux, circuit_t *circ) if (last_searched_direction == CELL_DIRECTION_OUT) circ->n_mux = NULL; else TO_OR_CIRCUIT(circ)->p_mux = NULL; + /* Now remove it from the map */ + HT_REMOVE(chanid_circid_muxinfo_map, cmux->chanid_circid_map, hashent); + /* Free the hash entry */ tor_free(hashent); }

1 0

[tor/master] Fix 'warning: circuit was already inactive' and assert in circuitmux_make_circuit_inactive() during circuitmux_detach_all_circuits()
by andrea＠torproject.org 11 Oct '12

11 Oct '12

commit 1bc9a040f70cd27f06fac3a9e1b07729442c2f7d Author: Andrea Shepard <andrea(a)torproject.org> Date: Fri Oct 5 21:57:42 2012 -0700 Fix 'warning: circuit was already inactive' and assert in circuitmux_make_circuit_inactive() during circuitmux_detach_all_circuits() --- src/or/circuitmux.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/or/circuitmux.c b/src/or/circuitmux.c index 7d4992e..44d736a 100644 --- a/src/or/circuitmux.c +++ b/src/or/circuitmux.c @@ -386,7 +386,6 @@ circuitmux_detach_all_circuits(circuitmux_t *cmux) i = HT_START(chanid_circid_muxinfo_map, cmux->chanid_circid_map); while (i) { to_remove = *i; - i = HT_NEXT_RMV(chanid_circid_muxinfo_map, cmux->chanid_circid_map, i); if (to_remove) { /* Find a channel and circuit */ chan = channel_find_by_global_id(to_remove->chan_id); @@ -401,7 +400,11 @@ circuitmux_detach_all_circuits(circuitmux_t *cmux) * Update active_circuits et al.; this does policy notifies, so * comes before freeing policy data */ - circuitmux_make_circuit_inactive(cmux, circ, CELL_DIRECTION_OUT); + + if (to_remove->muxinfo.cell_count > 0) { + circuitmux_make_circuit_inactive(cmux, circ, CELL_DIRECTION_OUT); + } + /* Clear n_mux */ circ->n_mux = NULL; } else if (circ->magic == OR_CIRCUIT_MAGIC) { @@ -409,7 +412,11 @@ circuitmux_detach_all_circuits(circuitmux_t *cmux) * Update active_circuits et al.; this does policy notifies, so * comes before freeing policy data */ - circuitmux_make_circuit_inactive(cmux, circ, CELL_DIRECTION_IN); + + if (to_remove->muxinfo.cell_count > 0) { + circuitmux_make_circuit_inactive(cmux, circ, CELL_DIRECTION_IN); + } + /* * It has a sensible p_chan and direction == CELL_DIRECTION_IN, * so clear p_mux. @@ -456,10 +463,12 @@ circuitmux_detach_all_circuits(circuitmux_t *cmux) /* Assert that we don't have un-freed policy data for this circuit */ tor_assert(to_remove->muxinfo.policy_data == NULL); - - /* Free it */ - tor_free(to_remove); } + + i = HT_NEXT_RMV(chanid_circid_muxinfo_map, cmux->chanid_circid_map, i); + + /* Free it */ + tor_free(to_remove); } cmux->n_circuits = 0;

1 0

[tor/master] Make channel_flush_some_cells() compile cleanly on machines with ssize_t larger than int per sjumrdoch comment
by andrea＠torproject.org 11 Oct '12

11 Oct '12

commit 217352c3624aa62384af57a2e7046e577671b915 Author: Andrea Shepard <andrea(a)torproject.org> Date: Wed Oct 10 00:19:57 2012 -0700 Make channel_flush_some_cells() compile cleanly on machines with ssize_t larger than int per sjumrdoch comment --- src/or/channel.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/or/channel.c b/src/or/channel.c index 880fa63..1ca5e1a 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -2018,7 +2018,7 @@ channel_flush_some_cells(channel_t *chan, ssize_t num_cells) { unsigned int unlimited = 0; ssize_t flushed = 0; - int num_cells_from_circs; + int num_cells_from_circs, clamped_num_cells; tor_assert(chan); @@ -2033,12 +2033,20 @@ channel_flush_some_cells(channel_t *chan, ssize_t num_cells) if (!unlimited && num_cells <= flushed) goto done; if (circuitmux_num_cells(chan->cmux) > 0) { + /* Calculate number of cells, including clamp */ + if (unlimited) { + clamped_num_cells = MAX_CELLS_TO_GET_FROM_CIRCUITS_FOR_UNLIMITED; + } else { + if (num_cells - flushed > + MAX_CELLS_TO_GET_FROM_CIRCUITS_FOR_UNLIMITED) { + clamped_num_cells = MAX_CELLS_TO_GET_FROM_CIRCUITS_FOR_UNLIMITED; + } else { + clamped_num_cells = (int)(num_cells - flushed); + } + } /* Try to get more cells from any active circuits */ num_cells_from_circs = channel_flush_from_first_active_circuit( - chan, - (unlimited ? - MAX_CELLS_TO_GET_FROM_CIRCUITS_FOR_UNLIMITED : - (num_cells - flushed))); + chan, clamped_num_cells); /* If it claims we got some, process the queue again */ if (num_cells_from_circs > 0) {

1 0

[tor/master] Bring summary comment block in circuitmux.c up to date
by andrea＠torproject.org 11 Oct '12

11 Oct '12

commit c9e48ded5d05750fa5654aa6f9d9138265b52a37 Author: Andrea Shepard <andrea(a)torproject.org> Date: Tue Oct 2 20:08:30 2012 -0700 Bring summary comment block in circuitmux.c up to date --- src/or/circuitmux.c | 46 +++++++++++++++++++++++++++++++++++++--------- 1 files changed, 37 insertions(+), 9 deletions(-) diff --git a/src/or/circuitmux.c b/src/or/circuitmux.c index 7be6858..7d4992e 100644 --- a/src/or/circuitmux.c +++ b/src/or/circuitmux.c @@ -47,24 +47,52 @@ typedef struct circuit_muxinfo_s circuit_muxinfo_t; * To channels, which each have a circuitmux_t, the supported operations * are: * - * circuitmux_flush_cells(): + * circuitmux_get_first_active_circuit(): * - * Retrieve a cell from one of the active circuits, chosen according to - * the circuitmux_t's cell selection policy. + * Pick one of the circuitmux's active circuits to send cells from. * - * circuitmux_unlink_all(): + * circuitmux_notify_xmit_cells(): * - * The channel is closing down, all circuits must be detached. + * Notify the circuitmux that cells have been sent on a circuit. * * To circuits, the exposed operations are: * - * TODO + * circuitmux_attach_circuit(): * - * To circuit selection policies, the exposed operations are: + * Attach a circuit to the circuitmux; this will allocate any policy- + * specific data wanted for this circuit and add it to the active + * circuits list if it has queued cells. * - * TODO + * circuitmux_detach_circuit(): * - * General status inquiries? + * Detach a circuit from the circuitmux, freeing associated structures. + * + * circuitmux_clear_num_cells(): + * + * Clear the circuitmux's cell counter for this circuit. + * + * circuitmux_set_num_cells(): + * + * Set the circuitmux's cell counter for this circuit. + * + * See circuitmux.h for the circuitmux_policy_t data structure, which contains + * a table of function pointers implementing a circuit selection policy, and + * circuitmux_ewma.c for an example of a circuitmux policy. Circuitmux + * policies can be manipulated with: + * + * circuitmux_get_policy(): + * + * Return the current policy for a circuitmux_t, if any. + * + * circuitmux_clear_policy(): + * + * Remove a policy installed on a circuitmux_t, freeing all associated + * data. The circuitmux will revert to the built-in round-robin behavior. + * + * circuitmux_set_policy(): + * + * Install a policy on a circuitmux_t; the appropriate callbacks will be + * made to attach all existing circuits to the new policy. * */

1 0

[tor/master] New and improved circuitmux_detach_all_circuits(), now without the stupid
by andrea＠torproject.org 11 Oct '12

11 Oct '12

commit 49d534e524090a0270a9d43822a42e5676b3c63f Author: Andrea Shepard <andrea(a)torproject.org> Date: Mon Oct 1 21:03:38 2012 -0700 New and improved circuitmux_detach_all_circuits(), now without the stupid --- src/or/circuitmux.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/or/circuitmux.c b/src/or/circuitmux.c index d4ea643..7be6858 100644 --- a/src/or/circuitmux.c +++ b/src/or/circuitmux.c @@ -369,24 +369,24 @@ circuitmux_detach_all_circuits(circuitmux_t *cmux) if (circ) { /* Clear the circuit's mux for this direction */ if (to_remove->muxinfo.direction == CELL_DIRECTION_OUT) { - /* Clear n_mux */ - circ->n_mux = NULL; /* * Update active_circuits et al.; this does policy notifies, so * comes before freeing policy data */ circuitmux_make_circuit_inactive(cmux, circ, CELL_DIRECTION_OUT); + /* Clear n_mux */ + circ->n_mux = NULL; } else if (circ->magic == OR_CIRCUIT_MAGIC) { /* - * It has a sensible p_chan and direction == CELL_DIRECTION_IN, - * so clear p_mux. - */ - TO_OR_CIRCUIT(circ)->p_mux = NULL; - /* * Update active_circuits et al.; this does policy notifies, so * comes before freeing policy data */ circuitmux_make_circuit_inactive(cmux, circ, CELL_DIRECTION_IN); + /* + * It has a sensible p_chan and direction == CELL_DIRECTION_IN, + * so clear p_mux. + */ + TO_OR_CIRCUIT(circ)->p_mux = NULL; } else { /* Complain and move on */ log_warn(LD_CIRC,

1 0

[tor/master] Fix formatting in various places after 6465/6816 work
by andrea＠torproject.org 11 Oct '12

11 Oct '12

commit 5543c5b202b045bc5b7d8d4f127c54decd17e943 Author: Andrea Shepard <andrea(a)torproject.org> Date: Wed Oct 10 00:48:36 2012 -0700 Fix formatting in various places after 6465/6816 work --- src/common/crypto.c | 6 ++++-- src/or/channel.c | 5 +++-- src/or/circuitmux.c | 2 +- src/or/circuitmux_ewma.c | 6 +++--- src/or/config.c | 1 - src/or/networkstatus.c | 1 - 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index 2de624c..87a86af 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -244,8 +244,10 @@ crypto_global_init(int useAccel, const char *accelName, const char *accelDir) } if (SSLeay() < OPENSSL_V_SERIES(1,0,0)) { - log_notice(LD_CRYPTO, "Your OpenSSL version seems to be %s. We " - "recommend 1.0.0 or later.", crypto_openssl_get_version_str()); + log_notice(LD_CRYPTO, + "Your OpenSSL version seems to be %s. We recommend 1.0.0 " + "or later.", + crypto_openssl_get_version_str()); } if (useAccel > 0) { diff --git a/src/or/channel.c b/src/or/channel.c index 1ca5e1a..570bb37 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -1518,7 +1518,7 @@ cell_queue_entry_dup(cell_queue_entry_t *q) rv = tor_malloc(sizeof(*rv)); memcpy(rv, q, sizeof(*rv)); - + return rv; } @@ -1529,7 +1529,8 @@ cell_queue_entry_dup(cell_queue_entry_t *q) */ static void -cell_queue_entry_free(cell_queue_entry_t *q, int handed_off) { +cell_queue_entry_free(cell_queue_entry_t *q, int handed_off) +{ if (!q) return; if (!handed_off) { diff --git a/src/or/circuitmux.c b/src/or/circuitmux.c index 6a6fa6d..f3b6b7c 100644 --- a/src/or/circuitmux.c +++ b/src/or/circuitmux.c @@ -412,7 +412,7 @@ circuitmux_detach_all_circuits(circuitmux_t *cmux) * Update active_circuits et al.; this does policy notifies, so * comes before freeing policy data */ - + if (to_remove->muxinfo.cell_count > 0) { circuitmux_make_circuit_inactive(cmux, circ, CELL_DIRECTION_IN); } diff --git a/src/or/circuitmux_ewma.c b/src/or/circuitmux_ewma.c index 9c26e1b..82ad5c7 100644 --- a/src/or/circuitmux_ewma.c +++ b/src/or/circuitmux_ewma.c @@ -168,7 +168,7 @@ ewma_free_circ_data(circuitmux_t *cmux, circuitmux_policy_data_t *pol_data, circuit_t *circ, circuitmux_policy_circ_data_t *pol_circ_data); -static void +static void ewma_notify_circ_active(circuitmux_t *cmux, circuitmux_policy_data_t *pol_data, circuit_t *circ, @@ -329,7 +329,7 @@ ewma_free_circ_data(circuitmux_t *cmux, * the active_circuits_pqueue. */ -static void +static void ewma_notify_circ_active(circuitmux_t *cmux, circuitmux_policy_data_t *pol_data, circuit_t *circ, @@ -354,7 +354,7 @@ ewma_notify_circ_active(circuitmux_t *cmux, * the active_circuits_pqueue. */ -static void +static void ewma_notify_circ_inactive(circuitmux_t *cmux, circuitmux_policy_data_t *pol_data, circuit_t *circ, diff --git a/src/or/config.c b/src/or/config.c index 81528c8..3e92c43 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1389,7 +1389,6 @@ options_act(const or_options_t *old_options) channel_set_cmux_policy_everywhere(NULL); } - /* Update the BridgePassword's hashed version as needed. We store this as a * digest so that we can do side-channel-proof comparisons on it. */ diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 0f6161e..91720b5 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1844,7 +1844,6 @@ networkstatus_set_current_consensus(const char *consensus, channel_set_cmux_policy_everywhere(NULL); } - /* XXXX024 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);

1 0