Issue #73: Switch to 4 L2 guards to match vanguards-lite in C-Tor

mikeperry-tor · May 19, 2021 · 14ec2fd · 14ec2fd
1 parent 97ac8af
commit 14ec2fd
Show file tree

Hide file tree

Showing 6 changed files with 48,634 additions and 46,760 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -21,6 +21,7 @@ next
 - Close circuits before logging about the issue. #67.
 - Always close PATH_BIAS_TESTING circutis with invalid cells. #68
 - Eliminate clearly invalid cases of allowed dropped cells. #69
+- Use 4 Layer2 guards, to match upcoming C tor's vanguards-lite. #73.
 
 
 0.3.1

diff --git a/README_TECHNICAL.md b/README_TECHNICAL.md
@@ -114,11 +114,7 @@ Lengths](https://raw.githubusercontent.com/asn-d6/vanguard_simulator/illustratio
 
 The number of nodes in each of these sets, as well as the ranges on rotation
 times for each set, can be specified as config file parameters. The subsystem
-currently uses 2 entry guards, 3 layer2 guards, and 8 layer3 guards.
-
-High load onion services may consider using 4 layer2 guards by changing the
-**num_layer2_guards** option in the [configuration
-file](https://github.com/mikeperry-tor/vanguards/blob/master/vanguards-example.conf), but going beyond that is not recommended.
+currently uses 2 entry guards, 4 layer2 guards, and 8 layer3 guards.
 
 ## The Rendguard Subsystem
 

diff --git a/src/vanguards/vanguards.py b/src/vanguards/vanguards.py
@@ -27,7 +27,7 @@
 ################### Vanguard options ##################
 #
 NUM_LAYER1_GUARDS = 2 # 0 is Tor default
-NUM_LAYER2_GUARDS = 3
+NUM_LAYER2_GUARDS = 4
 NUM_LAYER3_GUARDS = 8
 
 # In days:

diff --git a/tests/default.conf b/tests/default.conf
@@ -20,7 +20,7 @@ max_layer3_lifetime_hours = 48
 min_layer2_lifetime_hours = 24
 min_layer3_lifetime_hours = 1
 num_layer1_guards = 2
-num_layer2_guards = 3
+num_layer2_guards = 4
 num_layer3_guards = 8
 
 [Bandguards]