From 4027b8ef75040310385d40befaa8c8408d3ccf30 Mon Sep 17 00:00:00 2001 From: Quentin Dufour Date: Sat, 18 Jan 2020 19:48:38 +0000 Subject: [PATCH] add 2 other strategies --- scripts/Makefile | 267 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 266 insertions(+), 1 deletion(-) diff --git a/scripts/Makefile b/scripts/Makefile index 6218079..77c7c4e 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -819,4 +819,269 @@ jan_battle_normal: tor2 -f /etc/torrc_guard_16, \ tor2 -f /etc/torrc_guard_16, \ tor2 -f /etc/torrc_guard_16. - + +jan_battle_hardened: + ./run-3 \ + 8,jan_battle_hardened. \ + orig-client 135000 40 172, \ + orig-client 135000 40 172, \ + orig-client 135000 40 172, \ + orig-client 135000 40 172, \ + orig-client 135000 40 172, \ + orig-client 135000 40 172, \ + orig-client 135000 40 172, \ + orig-client 135000 40 172, \ + dup2-client 135000 40 172 2, \ + dup2-client 135000 40 172 2, \ + dup2-client 135000 40 172 2, \ + dup2-client 135000 40 172 2, \ + dup2-client 135000 40 172 2, \ + dup2-client 135000 40 172 2, \ + dup2-client 135000 40 172 2, \ + dup2-client 135000 40 172 2, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000. \ + orig-server 135000 40 172, \ + orig-server 135000 40 172, \ + orig-server 135000 40 172, \ + orig-server 135000 40 172, \ + orig-server 135000 40 172, \ + orig-server 135000 40 172, \ + orig-server 135000 40 172, \ + orig-server 135000 40 172, \ + dup2-server 135000 40 172 2, \ + dup2-server 135000 40 172 2, \ + dup2-server 135000 40 172 2, \ + dup2-server 135000 40 172 2, \ + dup2-server 135000 40 172 2, \ + dup2-server 135000 40 172 2, \ + dup2-server 135000 40 172 2, \ + dup2-server 135000 40 172 2, \ + lightning-server 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-server 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-server 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-server 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-server 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-server 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-server 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-server 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-server 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-server 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-server 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-server 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-server 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-server 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-server 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-server 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000. \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2. \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2, \ + tor3 -f /etc/torrc_guard_2. + +jan_battle_light: + ./run-3 \ + 8,jan_battle_light. \ + orig-client 135000 40 172, \ + orig-client 135000 40 172, \ + orig-client 135000 40 172, \ + orig-client 135000 40 172, \ + orig-client 135000 40 172, \ + orig-client 135000 40 172, \ + orig-client 135000 40 172, \ + orig-client 135000 40 172, \ + dup2-client 135000 40 172 2, \ + dup2-client 135000 40 172 2, \ + dup2-client 135000 40 172 2, \ + dup2-client 135000 40 172 2, \ + dup2-client 135000 40 172 2, \ + dup2-client 135000 40 172 2, \ + dup2-client 135000 40 172 2, \ + dup2-client 135000 40 172 2, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000. \ + orig-server-single 135000 40 172, \ + orig-server-single 135000 40 172, \ + orig-server-single 135000 40 172, \ + orig-server-single 135000 40 172, \ + orig-server-single 135000 40 172, \ + orig-server-single 135000 40 172, \ + orig-server-single 135000 40 172, \ + orig-server-single 135000 40 172, \ + dup2-server-single 135000 40 172 2, \ + dup2-server-single 135000 40 172 2, \ + dup2-server-single 135000 40 172 2, \ + dup2-server-single 135000 40 172 2, \ + dup2-server-single 135000 40 172 2, \ + dup2-server-single 135000 40 172 2, \ + dup2-server-single 135000 40 172 2, \ + dup2-server-single 135000 40 172 2, \ + lightning-server-single 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-server-single 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-server-single 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-server-single 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-server-single 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-server-single 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-server-single 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-server-single 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-server-single 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-server-single 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-server-single 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-server-single 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-server-single 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-server-single 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-server-single 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-server-single 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000. \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16. \ + tor2 -f /etc/torrc_single_hop_16, \ + tor2 -f /etc/torrc_single_hop_16, \ + tor2 -f /etc/torrc_single_hop_16, \ + tor2 -f /etc/torrc_single_hop_16, \ + tor2 -f /etc/torrc_single_hop_16, \ + tor2 -f /etc/torrc_single_hop_16, \ + tor2 -f /etc/torrc_single_hop_16, \ + tor2 -f /etc/torrc_single_hop_16, \ + tor2 -f /etc/torrc_single_hop_16, \ + tor2 -f /etc/torrc_single_hop_16, \ + tor2 -f /etc/torrc_single_hop_16, \ + tor2 -f /etc/torrc_single_hop_16, \ + tor2 -f /etc/torrc_single_hop_16, \ + tor2 -f /etc/torrc_single_hop_16, \ + tor2 -f /etc/torrc_single_hop_16, \ + tor2 -f /etc/torrc_single_hop_16, \ + tor2 -f /etc/torrc_single_hop_16, \ + tor2 -f /etc/torrc_single_hop_16, \ + tor2 -f /etc/torrc_single_hop_16, \ + tor2 -f /etc/torrc_single_hop_16, \ + tor2 -f /etc/torrc_single_hop_16, \ + tor2 -f /etc/torrc_single_hop_16, \ + tor2 -f /etc/torrc_single_hop_16, \ + tor2 -f /etc/torrc_single_hop_16, \ + tor2 -f /etc/torrc_single_hop_16, \ + tor2 -f /etc/torrc_single_hop_16, \ + tor2 -f /etc/torrc_single_hop_16, \ + tor2 -f /etc/torrc_single_hop_16, \ + tor2 -f /etc/torrc_single_hop_16, \ + tor2 -f /etc/torrc_single_hop_16, \ + tor2 -f /etc/torrc_single_hop_16, \ + tor2 -f /etc/torrc_single_hop_16. + +