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

Bug 40709: Update congestion control parameters

Browse Source 
This brings us into sync with the consensus, and will be useful for test
vectors, to ensure behavior consistent with the consensus params.
This commit is contained in:
Mike Perry 2023-06-23 15:05:05 +00:00
parent 31a3efa60b
commit 9d022be9fc
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/or/congestion_control_common.c
View File

@ -40,14 +40,14 @@
#define SENDME_INC_DFLT (TLS_RECORD_MAX_CELLS) #define SENDME_INC_DFLT (TLS_RECORD_MAX_CELLS)
#define CIRCWINDOW_INIT (4*SENDME_INC_DFLT) #define CIRCWINDOW_INIT (4*SENDME_INC_DFLT)
#define CC_ALG_DFLT (CC_ALG_SENDME) #define CC_ALG_DFLT (CC_ALG_VEGAS)
#define CC_ALG_DFLT_ALWAYS (CC_ALG_VEGAS) #define CC_ALG_DFLT_ALWAYS (CC_ALG_VEGAS)
#define CWND_INC_DFLT (TLS_RECORD_MAX_CELLS) #define CWND_INC_DFLT (1)
#define CWND_INC_PCT_SS_DFLT (100) #define CWND_INC_PCT_SS_DFLT (100)
#define CWND_INC_RATE_DFLT (1) #define CWND_INC_RATE_DFLT (SENDME_INC_DFLT)
#define CWND_MIN_DFLT (2*SENDME_INC_DFLT) #define CWND_MIN_DFLT (CIRCWINDOW_INIT)
#define CWND_MAX_DFLT (INT32_MAX) #define CWND_MAX_DFLT (INT32_MAX)
#define BWE_SENDME_MIN_DFLT (5) #define BWE_SENDME_MIN_DFLT (5)

18
src/core/or/congestion_control_vegas.c
View File

@ -37,30 +37,30 @@
#define VEGAS_SSCAP_SBWS_DFLT (400) #define VEGAS_SSCAP_SBWS_DFLT (400)
/* Exits are three hops, so params are based on 3 outbufs of cells */ /* Exits are three hops, so params are based on 3 outbufs of cells */
#define VEGAS_ALPHA_EXIT_DFLT (2*OUTBUF_CELLS) #define VEGAS_ALPHA_EXIT_DFLT (3*OUTBUF_CELLS)
#define VEGAS_BETA_EXIT_DFLT (4*OUTBUF_CELLS) #define VEGAS_BETA_EXIT_DFLT (4*OUTBUF_CELLS)
#define VEGAS_GAMMA_EXIT_DFLT (3*OUTBUF_CELLS) #define VEGAS_GAMMA_EXIT_DFLT (3*OUTBUF_CELLS)
#define VEGAS_DELTA_EXIT_DFLT (6*OUTBUF_CELLS) #define VEGAS_DELTA_EXIT_DFLT (5*OUTBUF_CELLS)
#define VEGAS_SSCAP_EXIT_DFLT (500) #define VEGAS_SSCAP_EXIT_DFLT (600)
/* Onion rends are six hops, so params are based on 6 outbufs of cells */ /* Onion rends are six hops, so params are based on 6 outbufs of cells */
#define VEGAS_ALPHA_ONION_DFLT (3*OUTBUF_CELLS) #define VEGAS_ALPHA_ONION_DFLT (3*OUTBUF_CELLS)
#define VEGAS_BETA_ONION_DFLT (7*OUTBUF_CELLS) #define VEGAS_BETA_ONION_DFLT (6*OUTBUF_CELLS)
#define VEGAS_GAMMA_ONION_DFLT (5*OUTBUF_CELLS) #define VEGAS_GAMMA_ONION_DFLT (4*OUTBUF_CELLS)
#define VEGAS_DELTA_ONION_DFLT (9*OUTBUF_CELLS) #define VEGAS_DELTA_ONION_DFLT (7*OUTBUF_CELLS)
#define VEGAS_SSCAP_ONION_DFLT (600) #define VEGAS_SSCAP_ONION_DFLT (475)
/** /**
* Number of sendme_incs between cwnd and inflight for cwnd to be * Number of sendme_incs between cwnd and inflight for cwnd to be
* still considered full */ * still considered full */
#define VEGAS_CWND_FULL_GAP_DFLT (1) #define VEGAS_CWND_FULL_GAP_DFLT (4)
static int cc_vegas_cwnd_full_gap = VEGAS_CWND_FULL_GAP_DFLT; static int cc_vegas_cwnd_full_gap = VEGAS_CWND_FULL_GAP_DFLT;
/** /**
* If the cwnd becomes less than this percent full at any point, * If the cwnd becomes less than this percent full at any point,
* we declare it not full immediately. * we declare it not full immediately.
*/ */
#define VEGAS_CWND_FULL_MINPCT_DFLT (75) #define VEGAS_CWND_FULL_MINPCT_DFLT (25)
static int cc_vegas_cwnd_full_minpct = VEGAS_CWND_FULL_MINPCT_DFLT; static int cc_vegas_cwnd_full_minpct = VEGAS_CWND_FULL_MINPCT_DFLT;
/** /**