diff options
| author | Blair Prescott <Blair.Prescott@broadcom.com> | 2021-08-13 10:36:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-13 10:36:13 +0000 |
| commit | 816c52354f13b0160961c93e3d89215c678dfe6f (patch) | |
| tree | 690cf88bdbdb6c0627240dace5f95a64756df270 | |
| parent | 770b04e24edbaec49c39cec5024d320d3009d5aa (diff) | |
| parent | bdc1f6fcdfa3620a9d86f632054c3f0e8e2698f8 (diff) | |
| download | tests-816c52354f13b0160961c93e3d89215c678dfe6f.tar.gz | |
net-test: Reset blackhole before fastopen test am: beccb965e2 am: 720ff59c2e am: bdc1f6fcdf
Original change: https://android-review.googlesource.com/c/kernel/tests/+/1794648
Change-Id: Ib6254f19c0c03cbbf7aedb14ec78d0df9a30641e
| -rwxr-xr-x | net/test/tcp_fastopen_test.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/net/test/tcp_fastopen_test.py b/net/test/tcp_fastopen_test.py index eadae79..5b89a2d 100755 --- a/net/test/tcp_fastopen_test.py +++ b/net/test/tcp_fastopen_test.py @@ -28,6 +28,7 @@ import tcp_metrics TCPOPT_FASTOPEN = 34 TCP_FASTOPEN_CONNECT = 30 +BH_TIMEOUT_SYSCTL = "/proc/sys/net/ipv4/tcp_fastopen_blackhole_timeout_sec" class TcpFastOpenTest(multinetwork_base.MultiNetworkBaseTest): @@ -63,12 +64,21 @@ class TcpFastOpenTest(multinetwork_base.MultiNetworkBaseTest): with self.assertRaisesErrno(ENOENT): self.tcp_metrics.GetMetrics(saddr, daddr) + def clearBlackhole(self): + if net_test.LINUX_VERSION < (4, 14, 0): + return + timeout = self.GetSysctl(BH_TIMEOUT_SYSCTL) + + # Write to timeout to clear any pre-existing blackhole condition + self.SetSysctl(BH_TIMEOUT_SYSCTL, timeout) + def CheckConnectOption(self, version): ip_layer = {4: scapy.IP, 6: scapy.IPv6}[version] netid = self.RandomNetid() s = self.TFOClientSocket(version, netid) self.clearTcpMetrics(version, netid) + self.clearBlackhole() # Connect the first time. remoteaddr = self.GetRemoteAddress(version) |