go
/
gvisor
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compute size of struct tcp_info instead of hardcoding it. 

PiperOrigin-RevId: 263040624
This commit is contained in:
Rahat Mahmood 2019-08-12 17:33:26 -07:00 committed by gVisor bot
parent eac690e358
commit 691c2f8173
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/abi/linux/socket.go
View File

@ -366,7 +366,7 @@ type TCPInfo struct {
} }
// SizeOfTCPInfo is the binary size of a 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. // Control message types, from linux/socket.h.
const ( const (

4
test/syscalls/linux/proc_net_tcp.cc
View File

@ -187,9 +187,9 @@ TEST(ProcNetTCP, EntryUID) {
std::vector<TCPEntry> entries = std::vector<TCPEntry> entries =
ASSERT_NO_ERRNO_AND_VALUE(ProcNetTCPEntries()); ASSERT_NO_ERRNO_AND_VALUE(ProcNetTCPEntries());
TCPEntry e; TCPEntry e;
EXPECT_TRUE(FindByLocalAddr(entries, &e, sockets->first_addr())); ASSERT_TRUE(FindByLocalAddr(entries, &e, sockets->first_addr()));
EXPECT_EQ(e.uid, geteuid()); 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()); EXPECT_EQ(e.uid, geteuid());
} }