diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2020-12-31 21:52:02 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2020-12-31 21:52:02 +0000 |
| commit | 996a98d33f790a1e6af927c02318649feec6061b (patch) | |
| tree | 5d00c8d4d9851daca562e3114cc3c8939ab6cbd6 /test | |
| parent | 32131d8971eef03a74eef7a7127ca32d4378f50e (diff) | |
TFO: better observability (slightly) on FreeBSD
Diffstat (limited to 'test')
| -rwxr-xr-x | test/runtest | 2 | ||||
| -rw-r--r-- | test/scripts/1990-TCP-Fast-Open/1990 | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/test/runtest b/test/runtest index b5ace4ee3..1e604e1cd 100755 --- a/test/runtest +++ b/test/runtest @@ -3112,7 +3112,7 @@ if (defined $parm_trusted_config_list) open(TCL, $parm_trusted_config_list) or die "Can't open $parm_trusted_config_list: $!\n"; my $test_config = getcwd() . '/test-config'; die "Can't find '$test_config' in TRUSTED_CONFIG_LIST $parm_trusted_config_list." - if not grep { /^\Q$test_config\E$/ } <TCL>; + if not grep { /^\Q$test_config\E$/ } <TCL>; } else { diff --git a/test/scripts/1990-TCP-Fast-Open/1990 b/test/scripts/1990-TCP-Fast-Open/1990 index 80059e685..d2c7b75f9 100644 --- a/test/scripts/1990-TCP-Fast-Open/1990 +++ b/test/scripts/1990-TCP-Fast-Open/1990 @@ -27,6 +27,14 @@ # 'net.inet.tcp.fastopen.server_enable=1' in /etc/sysctl.conf # Seems to always claim TFO used by transport, if tried. # +# FreeBSD: tried this setup, but we only get the banner captured 100ms after 3rd-ack: +# #kenv net.inet.ip.fw.default_to_accept=1 +# #kldload ipfw dummynet +# #ipfw add 00097 pipe 1 ip from 127.0.0.1 to 127.0.0.1 +# #ipfw pipe 1 config delay 50ms +# Also, the VM managed to lose the ipv4 & 6 addrs on its main interface +# after a while - so not usable in production +# sudo perl system ("tc qdisc add dev lo root netem delay 50ms"); **** @@ -50,7 +58,14 @@ system ("[ -e /proc/sys/net/ipv4/tcp_fastopen_blackhole_timeout_sec ] && echo 0 # # First clear any previously-obtained cookie: sudo perl +open(INFO, "-|", "/usr/bin/uname -s"); +$_ = <INFO>; +if (/^FreeBSD/) { +system("sysctl net.inet.tcp.fastopen.client_enable=0"); system("sysctl net.inet.tcp.fastopen.client_enable=1"); +} else { system ("ip tcp_metrics delete 127.0.0.1"); +} + **** # # |