nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Set circuitmux policy on new channels in channeltls.c

Browse Source
This commit is contained in:
Andrea Shepard 2012-10-01 20:27:01 -07:00
parent 0c4f717b3e
commit bb62281ba4
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/or/channeltls.c
View File

@ -17,6 +17,7 @@
#include "channel.h" #include "channel.h"
#include "channeltls.h" #include "channeltls.h"
#include "circuitmux.h" #include "circuitmux.h"
#include "circuitmux_ewma.h"
#include "config.h" #include "config.h"
#include "connection.h" #include "connection.h"
#include "connection_or.h" #include "connection_or.h"
@ -129,7 +130,9 @@ channel_tls_connect(const tor_addr_t *addr, uint16_t port,
channel_mark_outgoing(chan); channel_mark_outgoing(chan);
chan->cmux = circuitmux_alloc(); chan->cmux = circuitmux_alloc();
/* TODO set cmux policy */ if (cell_ewma_enabled()) {
circuitmux_set_policy(chan->cmux, &ewma_policy);
}
/* Set up or_connection stuff */ /* Set up or_connection stuff */
tlschan->conn = connection_or_connect(addr, port, id_digest, tlschan); 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); channel_mark_incoming(chan);
chan->cmux = circuitmux_alloc(); 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 we got one, we should register it */
if (chan) channel_register(chan); if (chan) channel_register(chan);