diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-09-13 21:47:35 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-09-13 21:47:35 +0000 |
| commit | 2c1c77754c78cac6c72c232dfc6da8812c931621 (patch) | |
| tree | 6e737cd3a67e866e38d242e07cd28ba25bbf3442 | |
| parent | fcb7c1e9f7e15e1d67a88a0993a6a8aeb5c9903e (diff) | |
| parent | e07fd058ec474d801748a849d9c5d1c6118c3c11 (diff) | |
Merge release-20210906.0-13-ge07fd058e (automated)
| -rw-r--r-- | pkg/tcpip/network/ipv4/ipv4.go | 3 | ||||
| -rw-r--r-- | pkg/tcpip/network/ipv6/ipv6.go | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkg/tcpip/network/ipv4/ipv4.go b/pkg/tcpip/network/ipv4/ipv4.go index 44c85bdb8..e2472c851 100644 --- a/pkg/tcpip/network/ipv4/ipv4.go +++ b/pkg/tcpip/network/ipv4/ipv4.go @@ -856,6 +856,8 @@ func (e *endpoint) handleLocalPacket(pkt *stack.PacketBuffer, canSkipRXChecksum } func (e *endpoint) handleValidatedPacket(h header.IPv4, pkt *stack.PacketBuffer, inNICName string) { + pkt.NICID = e.nic.ID() + // Raw socket packets are delivered based solely on the transport protocol // number. We only require that the packet be valid IPv4, and that they not // be fragmented. @@ -863,7 +865,6 @@ func (e *endpoint) handleValidatedPacket(h header.IPv4, pkt *stack.PacketBuffer, e.dispatcher.DeliverRawPacket(h.TransportProtocol(), pkt) } - pkt.NICID = e.nic.ID() stats := e.stats stats.ip.ValidPacketsReceived.Increment() diff --git a/pkg/tcpip/network/ipv6/ipv6.go b/pkg/tcpip/network/ipv6/ipv6.go index b1aec5312..d4bd61748 100644 --- a/pkg/tcpip/network/ipv6/ipv6.go +++ b/pkg/tcpip/network/ipv6/ipv6.go @@ -1127,11 +1127,12 @@ func (e *endpoint) handleLocalPacket(pkt *stack.PacketBuffer, canSkipRXChecksum } func (e *endpoint) handleValidatedPacket(h header.IPv6, pkt *stack.PacketBuffer, inNICName string) { + pkt.NICID = e.nic.ID() + // Raw socket packets are delivered based solely on the transport protocol // number. We only require that the packet be valid IPv6. e.dispatcher.DeliverRawPacket(h.TransportProtocol(), pkt) - pkt.NICID = e.nic.ID() stats := e.stats.ip stats.ValidPacketsReceived.Increment() |