diff options
| author | Blair Prescott <Blair.Prescott@broadcom.com> | 2022-05-16 23:25:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-05-16 23:25:11 +0000 |
| commit | 33f721a1cfbce745fa842ec51dfeec3b86f06e1b (patch) | |
| tree | b97faae6c8d7c41ab72aafcd9062312784c08f71 | |
| parent | e7a47cbf6597953f6025734f17cd96faa6a2f1ef (diff) | |
| parent | 9506bc7d7c57826c7aaf77f4b7b311243e521ff3 (diff) | |
| download | tests-33f721a1cfbce745fa842ec51dfeec3b86f06e1b.tar.gz | |
net-test: Reset blackhole before fastopen test am: 47b593d818 am: b91d36e88e am: 9506bc7d7c
Original change: https://android-review.googlesource.com/c/kernel/tests/+/1794954
Change-Id: I0ba6ab1e5fbf9f70d498e757b48c7202b4fe7f02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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) |