aboutsummaryrefslogtreecommitdiff
path: root/src/test/test_channel.c
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2018-02-15 13:45:21 -0500
committerDavid Goulet <dgoulet@torproject.org>2018-02-15 13:45:21 -0500
commit6b1dba214db3058b143bbb4d4c4bdfee32d100f1 (patch)
tree7a1571fee4f643a0481840a1059224bd91e68724 /src/test/test_channel.c
parentf6a230ec9555688d61db37eb22c8823619332d83 (diff)
downloadtor-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/test/test_channel.c')
-rw-r--r--src/test/test_channel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/test_channel.c b/src/test/test_channel.c
index bdc9d32f78..3927597687 100644
--- a/src/test/test_channel.c
+++ b/src/test/test_channel.c
@@ -575,7 +575,7 @@ test_channel_outbound_cell(void *arg)
channel_register(chan);
tt_int_op(chan->registered, OP_EQ, 1);
/* Set EWMA policy so we can pick it when flushing. */
- channel_set_cmux_policy_everywhere(&ewma_policy);
+ circuitmux_set_policy(chan->cmux, &ewma_policy);
tt_ptr_op(circuitmux_get_policy(chan->cmux), OP_EQ, &ewma_policy);
/* Register circuit to the channel circid map which will attach the circuit