This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit f501564b40252089f551baa45fceeedd16f6bedf Author: David Goulet dgoulet@torproject.org AuthorDate: Tue Oct 18 12:19:40 2022 -0400
relay: Reduce the minimum circuit cell in queue limit
With congestion control, the flow control window is much lower than the initial 1000.
Signed-off-by: David Goulet dgoulet@torproject.org --- src/core/or/relay.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/core/or/relay.c b/src/core/or/relay.c index 5046c9cc55..01a377b6f5 100644 --- a/src/core/or/relay.c +++ b/src/core/or/relay.c @@ -3134,6 +3134,9 @@ channel_flush_from_first_active_circuit, (channel_t *chan, int max)) }
/* Minimum value is the maximum circuit window size. + * + * This value is set to a lower bound we believe is reasonable with congestion + * control and basic network tunning parameters. * * SENDME cells makes it that we can control how many cells can be inflight on * a circuit from end to end. This logic makes it that on any circuit cell @@ -3157,12 +3160,12 @@ channel_flush_from_first_active_circuit, (channel_t *chan, int max)) * DoS memory pressure so the default size is a middle ground between not * having any limit and having a very restricted one. This is why we can also * control it through a consensus parameter. */ -#define RELAY_CIRC_CELL_QUEUE_SIZE_MIN CIRCWINDOW_START_MAX +#define RELAY_CIRC_CELL_QUEUE_SIZE_MIN 50 /* We can't have a consensus parameter above this value. */ #define RELAY_CIRC_CELL_QUEUE_SIZE_MAX INT32_MAX /* Default value is set to a large value so we can handle padding cells - * properly which aren't accounted for in the SENDME window. Default is 50000 - * allowed cells in the queue resulting in ~25MB. */ + * properly which aren't accounted for in the SENDME window. Default is 2500 + * allowed cells in the queue resulting in ~1MB. */ #define RELAY_CIRC_CELL_QUEUE_SIZE_DEFAULT \ (50 * RELAY_CIRC_CELL_QUEUE_SIZE_MIN)