Compute size of struct tcp_info instead of hardcoding it.

PiperOrigin-RevId: 263040624
google · Aug 13, 2019 · 691c2f8 · 691c2f8
1 parent eac690e
commit 691c2f8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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());
 }