diff --git a/Testvars.pm b/Testvars.pm index d2d2e4d..8851ce8 100644 --- a/Testvars.pm +++ b/Testvars.pm @@ -32,12 +32,12 @@ our @PLOTORDER; our %TESTPLOT; my @testplot = ( 'iperf3_-c10.3.0.33_-w1m_-t10' => "tcp", - 'iperf3_-c10.3.2.35_-w1m_-t10' => "tcp", - 'iperf3_-c10.3.45.35_-w1m_-t10' => "tcp", - 'iperf3_-c10.3.45.35_-w1m_-P10_-t10' => "tcp", 'iperf3_-c10.3.0.33_-w1m_-t10_-R' => "tcp", + 'iperf3_-c10.3.2.35_-w1m_-t10' => "tcp", 'iperf3_-c10.3.2.35_-w1m_-t10_-R' => "tcp", + 'iperf3_-c10.3.45.35_-w1m_-t10' => "tcp", 'iperf3_-c10.3.45.35_-w1m_-t10_-R' => "tcp", + 'iperf3_-c10.3.45.35_-w1m_-P10_-t10' => "tcp", 'iperf3_-c10.3.45.35_-w1m_-P10_-t10_-R' => "tcp", 'tcpbench_-S1000000_-t10_10.3.0.33' => "tcp", 'tcpbench_-S1000000_-t10_10.3.2.35' => "tcp", @@ -46,10 +46,10 @@ my @testplot = ( 'tcpbench_-S1000000_-t10_-n100_10.3.2.35' => "tcp", 'tcpbench_-S1000000_-t10_-n100_10.3.45.35' => "tcp", 'iperf3_-c10.3.0.33_-u_-b10G_-w1m_-t10' => "udp", - 'iperf3_-c10.3.2.35_-u_-b10G_-w1m_-t10' => "udp", - 'iperf3_-c10.3.45.35_-u_-b10G_-w1m_-t10' => "udp", 'iperf3_-c10.3.0.33_-u_-b10G_-w1m_-t10_-R' => "udp", + 'iperf3_-c10.3.2.35_-u_-b10G_-w1m_-t10' => "udp", 'iperf3_-c10.3.2.35_-u_-b10G_-w1m_-t10_-R' => "udp", + 'iperf3_-c10.3.45.35_-u_-b10G_-w1m_-t10' => "udp", 'iperf3_-c10.3.45.35_-u_-b10G_-w1m_-t10_-R' => "udp", 'udpbench_-l1472_-t10_-r_ot13_send_10.3.0.33' => "udp", 'udpbench_-l1472_-t10_-r_ot15_send_10.3.2.35' => "udp", @@ -64,18 +64,18 @@ my @testplot = ( 'udpbench_-l36_-t10_-r_ot15_recv_10.3.2.34' => "udp", 'udpbench_-l36_-t10_-r_ot15_recv_10.3.45.34' => "udp", 'iperf3_-6_-cfdd7:e83e:66bc:0302::35_-w1m_-t10' => "tcp6", - 'iperf3_-6_-cfdd7:e83e:66bc:0345::35_-w1m_-t10' => "tcp6", - 'iperf3_-6_-cfdd7:e83e:66bc:0345::35_-w1m_-P10_-t10' => "tcp6", 'iperf3_-6_-cfdd7:e83e:66bc:0302::35_-w1m_-t10_-R' => "tcp6", + 'iperf3_-6_-cfdd7:e83e:66bc:0345::35_-w1m_-t10' => "tcp6", 'iperf3_-6_-cfdd7:e83e:66bc:0345::35_-w1m_-t10_-R' => "tcp6", + 'iperf3_-6_-cfdd7:e83e:66bc:0345::35_-w1m_-P10_-t10' => "tcp6", 'iperf3_-6_-cfdd7:e83e:66bc:0345::35_-w1m_-P10_-t10_-R' => "tcp6", 'tcpbench_-S1000000_-t10_fdd7:e83e:66bc:0302::35' => "tcp6", 'tcpbench_-S1000000_-t10_fdd7:e83e:66bc:0345::35' => "tcp6", 'tcpbench_-S1000000_-t10_-n100_fdd7:e83e:66bc:0302::35' => "tcp6", 'tcpbench_-S1000000_-t10_-n100_fdd7:e83e:66bc:0345::35' => "tcp6", 'iperf3_-6_-cfdd7:e83e:66bc:0302::35_-u_-b10G_-w1m_-t10' => "udp6", - 'iperf3_-6_-cfdd7:e83e:66bc:0345::35_-u_-b10G_-w1m_-t10' => "udp6", 'iperf3_-6_-cfdd7:e83e:66bc:0302::35_-u_-b10G_-w1m_-t10_-R' => "udp6", + 'iperf3_-6_-cfdd7:e83e:66bc:0345::35_-u_-b10G_-w1m_-t10' => "udp6", 'iperf3_-6_-cfdd7:e83e:66bc:0345::35_-u_-b10G_-w1m_-t10_-R' => "udp6", 'udpbench_-l1452_-t10_-r_ot15_send_fdd7:e83e:66bc:0302::35' => "udp6", 'udpbench_-l1452_-t10_-r_ot15_send_fdd7:e83e:66bc:0345::35' => "udp6", @@ -86,33 +86,35 @@ my @testplot = ( 'udpbench_-l16_-t10_-r_ot15_recv_fdd7:e83e:66bc:0302::34' => "udp6", 'udpbench_-l16_-t10_-r_ot15_recv_fdd7:e83e:66bc:0345::34' => "udp6", 'iperf3_-c10.3.3.36_-w2m_-t10' => "linux", - 'iperf3_-c10.3.46.36_-w2m_-t10' => "linux", 'iperf3_-c10.3.3.36_-w2m_-t10_-R' => "linux", + 'iperf3_-c10.3.46.36_-w2m_-t10' => "linux", 'iperf3_-c10.3.46.36_-w2m_-t10_-R' => "linux", 'iperf3_-c10.3.3.36_-w2m_-P10_-t10' => "linux", - 'iperf3_-c10.3.46.36_-w2m_-P10_-t10' => "linux", 'iperf3_-c10.3.3.36_-w2m_-P10_-t10_-R' => "linux", + 'iperf3_-c10.3.46.36_-w2m_-P10_-t10' => "linux", 'iperf3_-c10.3.46.36_-w2m_-P10_-t10_-R' => "linux", 'iperf3_-6_-cfdd7:e83e:66bc:0303::36_-w2m_-t10' => "linux6", - 'iperf3_-6_-cfdd7:e83e:66bc:0346::36_-w2m_-t10' => "linux6", 'iperf3_-6_-cfdd7:e83e:66bc:0303::36_-w2m_-t10_-R' => "linux6", + 'iperf3_-6_-cfdd7:e83e:66bc:0346::36_-w2m_-t10' => "linux6", 'iperf3_-6_-cfdd7:e83e:66bc:0346::36_-w2m_-t10_-R' => "linux6", 'iperf3_-6_-cfdd7:e83e:66bc:0303::36_-w2m_-P10_-t10' => "linux6", - 'iperf3_-6_-cfdd7:e83e:66bc:0346::36_-w2m_-P10_-t10' => "linux6", 'iperf3_-6_-cfdd7:e83e:66bc:0303::36_-w2m_-P10_-t10_-R' => "linux6", + 'iperf3_-6_-cfdd7:e83e:66bc:0346::36_-w2m_-P10_-t10' => "linux6", 'iperf3_-6_-cfdd7:e83e:66bc:0346::36_-w2m_-P10_-t10_-R' => "linux6", + 'ssh_perform@lt13_iperf3_-c10.3.46.36_-t10' => "forward", + 'ssh_perform@lt13_iperf3_-c10.3.46.36_-t10_-R' => "forward", 'ssh_perform@lt13_iperf3_-c10.3.46.36_-P10_-t10' => "forward", 'ssh_perform@lt13_iperf3_-c10.3.46.36_-P10_-t10_-R' => "forward", - 'ssh_perform@lt13_iperf3_-c10.3.46.36_-t10' => "forward", 'ssh_perform@lt13_iperf3_-c10.3.34.34_-P10_-t10' => "forward", 'ssh_perform@lt13_iperf3_-c10.3.34.34_-P10_-t10_-R' => "forward", 'ssh_perform@lt16_iperf3_-c10.3.46.34_-P10_-t10' => "forward", 'ssh_perform@lt16_iperf3_-c10.3.46.34_-P10_-t10_-R' => "forward", 'ssh_perform@lt16_iperf3_-c10.3.56.35_-P10_-t10' => "forward", 'ssh_perform@lt16_iperf3_-c10.3.56.35_-P10_-t10_-R' => "forward", + 'ssh_perform@lt13_iperf3_-6_-cfdd7:e83e:66bc:0346::36_-t10' => "forward6", + 'ssh_perform@lt13_iperf3_-6_-cfdd7:e83e:66bc:0346::36_-t10_-R' => "forward6", 'ssh_perform@lt13_iperf3_-6_-cfdd7:e83e:66bc:0346::36_-P10_-t10' => "forward6", 'ssh_perform@lt13_iperf3_-6_-cfdd7:e83e:66bc:0346::36_-P10_-t10_-R' => "forward6", - 'ssh_perform@lt13_iperf3_-6_-cfdd7:e83e:66bc:0346::36_-t10' => "forward6", 'ssh_perform@lt13_iperf3_-6_-cfdd7:e83e:66bc:0334::34_-P10_-t10' => "forward6", 'ssh_perform@lt13_iperf3_-6_-cfdd7:e83e:66bc:0334::34_-P10_-t10_-R' => "forward6", 'ssh_perform@lt16_iperf3_-6_-cfdd7:e83e:66bc:0346::34_-P10_-t10' => "forward6", @@ -434,12 +436,14 @@ my @testdesc = ( 'udpbench_-l16_-t10_-r_ot15_send_fdd7:e83e:66bc:0302::35' => "openbsd-openbsd-stack-udp6bench-short-send-old", 'udpbench_-l36_-t10_-r_ot15_recv_fdd7:e83e:66bc:0302::34' => "openbsd-openbsd-stack-udp6bench-short-recv-bad", 'udpbench_-l36_-t10_-r_ot15_send_fdd7:e83e:66bc:0302::35' => "openbsd-openbsd-stack-udp6bench-short-send-bad", - 'ssh_perform@lt13_iperf3_-c10.3.46.36_-P10_-t10' => "linux-openbsd-linux-forward-tcp-ip3fwd", - 'ssh_perform@lt13_iperf3_-c10.3.46.36_-P10_-t10_-R' => "linux-openbsd-linux-forward-tcp-ip3rev", + 'ssh_perform@lt13_iperf3_-c10.3.46.36_-P10_-t10' => "linux-openbsd-linux-forward-tcp-ip3fwd-parallel", + 'ssh_perform@lt13_iperf3_-c10.3.46.36_-P10_-t10_-R' => "linux-openbsd-linux-forward-tcp-ip3rev-parallel", 'ssh_perform@lt13_iperf3_-c10.3.46.36_-t10' => "linux-openbsd-linux-forward-tcp-ip3fwd-single", - 'ssh_perform@lt13_iperf3_-6_-cfdd7:e83e:66bc:0346::36_-P10_-t10' => "linux-openbsd-linux-forward-tcp6-ip3fwd", - 'ssh_perform@lt13_iperf3_-6_-cfdd7:e83e:66bc:0346::36_-P10_-t10_-R' => "linux-openbsd-linux-forward-tcp6-ip3rev", + 'ssh_perform@lt13_iperf3_-c10.3.46.36_-t10_-R' => "linux-openbsd-linux-forward-tcp-ip3rev-single", + 'ssh_perform@lt13_iperf3_-6_-cfdd7:e83e:66bc:0346::36_-P10_-t10' => "linux-openbsd-linux-forward-tcp6-ip3fwd-parallel", + 'ssh_perform@lt13_iperf3_-6_-cfdd7:e83e:66bc:0346::36_-P10_-t10_-R' => "linux-openbsd-linux-forward-tcp6-ip3rev-parallel", 'ssh_perform@lt13_iperf3_-6_-cfdd7:e83e:66bc:0346::36_-t10' => "linux-openbsd-linux-forward-tcp6-ip3fwd-single", + 'ssh_perform@lt13_iperf3_-6_-cfdd7:e83e:66bc:0346::36_-t10_-R' => "linux-openbsd-linux-forward-tcp6-ip3rev-single", 'ssh_perform@lt13_iperf3_-c10.3.34.34_-P10_-t10' => "linux-openbsd-linux-splice-tcp-ip3fwd", 'ssh_perform@lt13_iperf3_-c10.3.34.34_-P10_-t10_-R' => "linux-openbsd-linux-splice-tcp-ip3rev", 'ssh_perform@lt13_iperf3_-6_-cfdd7:e83e:66bc:0334::34_-P10_-t10' => "linux-openbsd-linux-splice-tcp6-ip3fwd",