Prop 324: Reduce the number of vegas parameters

Also update their defaults.

1 files changed, 13 insertions, 8 deletions

diff --git a/proposals/324-rtt-congestion-control.txt b/proposals/324-rtt-congestion-control.txt
index c9997ef..c46fd4e 100644
--- a/proposals/324-rtt-congestion-control.txt
+++ b/proposals/324-rtt-congestion-control.txt
@@ -1416,18 +1416,23 @@ These are sorted in order of importance to tune, most important first.
 
 6.5.3. Vegas Parameters
 
-  cc_vegas_alpha_{exit,onion,sos,vg,sbws}:
-  cc_vegas_beta_{exit,onion,sos,vg,sbws}:
-  cc_vegas_gamma_{exit,onion,sos,vg,sbws}:
-  cc_vegas_delta_{exit,onion,sos,vg,sbws}:
+  cc_vegas_alpha_{exit,onion,sbws}:
+  cc_vegas_beta_{exit,onion,sbws}:
+  cc_vegas_gamma_{exit,onion,sbws}:
+  cc_vegas_delta_{exit,onion,sbws}:
     - Description: These parameters govern the number of cells
                    that [TOR_VEGAS] can detect in queue before reacting.
     - Range: [0, 1000] (except delta, which has max of INT32_MAX)
     - Defaults:
-           alpha: path_len*2*31-31
-           beta: path_len*2*31
-           gamma: path_len*2*31
-           delta: path_len*2*31 + 2*31
+           # OUTBUF_CELLS=62
+           cc_vegas_alpha_exit (2*OUTBUF_CELLS)
+           cc_vegas_beta_exit (4*OUTBUF_CELLS)
+           cc_vegas_gamma_exit (3*OUTBUF_CELLS)
+           cc_vegas_delta_exit (6*OUTBUF_CELLS)
+           cc_vegas_alpha_onion (3*OUTBUF_CELLS)
+           cc_vegas_beta_onion (7*OUTBUF_CELLS)
+           cc_vegas_gamma_onion (5*OUTBUF_CELLS)
+           cc_vegas_delta_onion (9*OUTBUF_CELLS)
     - Tuning Notes:
            The amount of queued cells that Vegas should tolerate is heavily
            dependent upon competing congestion control algorithms. The specified