diff options
| author | Rahat Mahmood <rahat@google.com> | 2019-08-12 17:33:26 -0700 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-08-12 17:34:38 -0700 |
| commit | 691c2f8173dfe7349e8289697299839cda32b495 (patch) | |
| tree | 0b9ac8bdddc1587f1c786f2554786d8f1a7bd880 | |
| parent | eac690e358e25897bb878fdfd1ad7036054162e2 (diff) | |
Compute size of struct tcp_info instead of hardcoding it.
PiperOrigin-RevId: 263040624
| -rw-r--r-- | pkg/abi/linux/socket.go | 2 | ||||
| -rw-r--r-- | test/syscalls/linux/proc_net_tcp.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkg/abi/linux/socket.go b/pkg/abi/linux/socket.go index e53165622..6857a20a3 100644 --- a/pkg/abi/linux/socket.go +++ b/pkg/abi/linux/socket.go @@ -366,7 +366,7 @@ type TCPInfo struct { } // SizeOfTCPInfo is the binary size of a TCPInfo struct. -const SizeOfTCPInfo = 104 +var SizeOfTCPInfo = int(binary.Size(TCPInfo{})) // Control message types, from linux/socket.h. const ( diff --git a/test/syscalls/linux/proc_net_tcp.cc b/test/syscalls/linux/proc_net_tcp.cc index 578b20680..2ca7b6ad7 100644 --- a/test/syscalls/linux/proc_net_tcp.cc +++ b/test/syscalls/linux/proc_net_tcp.cc @@ -187,9 +187,9 @@ TEST(ProcNetTCP, EntryUID) { std::vector<TCPEntry> entries = ASSERT_NO_ERRNO_AND_VALUE(ProcNetTCPEntries()); TCPEntry e; - EXPECT_TRUE(FindByLocalAddr(entries, &e, sockets->first_addr())); + ASSERT_TRUE(FindByLocalAddr(entries, &e, sockets->first_addr())); EXPECT_EQ(e.uid, geteuid()); - EXPECT_TRUE(FindByRemoteAddr(entries, &e, sockets->first_addr())); + ASSERT_TRUE(FindByRemoteAddr(entries, &e, sockets->first_addr())); EXPECT_EQ(e.uid, geteuid()); } |