diff options
| author | David Goulet <dgoulet@torproject.org> | 2018-02-15 13:45:21 -0500 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2018-02-15 13:45:21 -0500 |
| commit | 6b1dba214db3058b143bbb4d4c4bdfee32d100f1 (patch) | |
| tree | 7a1571fee4f643a0481840a1059224bd91e68724 /src/or/channeltls.c | |
| parent | f6a230ec9555688d61db37eb22c8823619332d83 (diff) | |
| download | tor-6b1dba214db3058b143bbb4d4c4bdfee32d100f1.tar.gz tor-6b1dba214db3058b143bbb4d4c4bdfee32d100f1.zip | |
cmux: Make EWMA policy mandatory
To achieve this, a default value for the CircuitPriorityHalflife option was
needed. We still look in the options and then the consensus but in case no
value can be found, the default CircuitPriorityHalflifeMsec=30000 is used. It
it the value we've been using since 0.2.4.4-alpha.
This means that EWMA, our only policy, can not be disabled anymore fallbacking
to the round robin algorithm. Unneeded code to control that is removed in this
commit.
Part of #25268
Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/or/channeltls.c')
| -rw-r--r-- | src/or/channeltls.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/or/channeltls.c b/src/or/channeltls.c index 9000703b01..54d94f6109 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -160,9 +160,8 @@ channel_tls_common_init(channel_tls_t *tlschan) chan->write_var_cell = channel_tls_write_var_cell_method; chan->cmux = circuitmux_alloc(); - if (cell_ewma_enabled()) { - circuitmux_set_policy(chan->cmux, &ewma_policy); - } + /* We only have one policy for now so always set it to EWMA. */ + circuitmux_set_policy(chan->cmux, &ewma_policy); } /** |