From e27bab3a4913d28ada06ffbfe3d887dea02857f3 Mon Sep 17 00:00:00 2001
From: Michael Tuexen <tuexen@fh-muenster.de>
Date: Mon, 29 Mar 2021 17:03:46 +0200
Subject: [PATCH] Don't include the padding in struct tcp_info for FreeBSD
No all variants of FreeBSD this test suite runs on follow the
layout.
---
gtests/net/packetdrill/tcp.h | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/gtests/net/packetdrill/tcp.h b/gtests/net/packetdrill/tcp.h
index c418ac29..20d61a75 100644
--- a/gtests/net/packetdrill/tcp.h
+++ b/gtests/net/packetdrill/tcp.h
@@ -184,7 +184,7 @@ struct _tcp_info {
u_int8_t __tcpi_backoff;
u_int8_t tcpi_options;
u_int8_t tcpi_snd_wscale:4,
- tcpi_rcv_wscale:4;
+ tcpi_rcv_wscale:4;
u_int32_t tcpi_rto;
u_int32_t __tcpi_ato;
@@ -223,9 +223,6 @@ struct _tcp_info {
u_int32_t tcpi_snd_rexmitpack;
u_int32_t tcpi_rcv_ooopack;
u_int32_t tcpi_snd_zerowin;
-
- /* Padding to grow without breaking ABI. */
- u_int32_t __tcpi_pad[26]; /* Padding. */
};
#endif /* __FreeBSD__ */
--
GitLab