diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-12-11 04:15:15 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-12-11 04:15:15 +0000 |
| commit | 032a6ffb269b1c2a5ca74b0844b9c6145ecaff83 (patch) | |
| tree | d94423eef867d1e6e8d73dd9dd7e874621fecfa2 /pkg | |
| parent | 818c2fee4a38848ade784efe533aa15829ce0e5e (diff) | |
| parent | bcb97a3bb7560fab49ac35d8c184a510cb81f801 (diff) | |
Merge release-20201130.0-84-gbcb97a3bb (automated)
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/tcpip/link/fdbased/endpoint.go | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkg/tcpip/link/fdbased/endpoint.go b/pkg/tcpip/link/fdbased/endpoint.go index 9f2084eae..cb94cbea6 100644 --- a/pkg/tcpip/link/fdbased/endpoint.go +++ b/pkg/tcpip/link/fdbased/endpoint.go @@ -284,9 +284,12 @@ func createInboundDispatcher(e *endpoint, fd int, isSocket bool) (linkDispatcher } switch sa.(type) { case *unix.SockaddrLinklayer: - // enable PACKET_FANOUT mode is the underlying socket is - // of type AF_PACKET. - const fanoutType = 0x8000 // PACKET_FANOUT_HASH | PACKET_FANOUT_FLAG_DEFRAG + // Enable PACKET_FANOUT mode if the underlying socket is of type + // AF_PACKET. We do not enable PACKET_FANOUT_FLAG_DEFRAG as that will + // prevent gvisor from receiving fragmented packets and the host does the + // reassembly on our behalf before delivering the fragments. This makes it + // hard to test fragmentation reassembly code in Netstack. + const fanoutType = unix.PACKET_FANOUT_HASH fanoutArg := fanoutID | fanoutType<<16 if err := syscall.SetsockoptInt(fd, syscall.SOL_PACKET, unix.PACKET_FANOUT, fanoutArg); err != nil { return nil, fmt.Errorf("failed to enable PACKET_FANOUT option: %v", err) |