diff options
| author | gVisor bot <gvisor-bot@google.com> | 2019-11-22 22:59:06 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-11-22 22:59:06 +0000 |
| commit | be617b8a62b735bf97e0948527622d221b9642dd (patch) | |
| tree | 1a669845fa2663c7f57df0067d5d3396620b8ac6 /pkg/tcpip/link/sniffer | |
| parent | 70f9648aacbb789775e189e3c058c325141be3c4 (diff) | |
| parent | 9db08c4e583e758e3eb1aed03875743ce02b8cff (diff) | |
Merge release-20191114.0-22-g9db08c4 (automated)
Diffstat (limited to 'pkg/tcpip/link/sniffer')
| -rw-r--r-- | pkg/tcpip/link/sniffer/sniffer.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkg/tcpip/link/sniffer/sniffer.go b/pkg/tcpip/link/sniffer/sniffer.go index 122680e10..767f14303 100644 --- a/pkg/tcpip/link/sniffer/sniffer.go +++ b/pkg/tcpip/link/sniffer/sniffer.go @@ -233,15 +233,15 @@ func (e *endpoint) WritePacket(r *stack.Route, gso *stack.GSO, protocol tcpip.Ne // WritePackets implements the stack.LinkEndpoint interface. It is called by // higher-level protocols to write packets; it just logs the packet and // forwards the request to the lower endpoint. -func (e *endpoint) WritePackets(r *stack.Route, gso *stack.GSO, hdrs []stack.PacketDescriptor, payload buffer.VectorisedView, protocol tcpip.NetworkProtocolNumber) (int, *tcpip.Error) { - view := payload.ToView() - for _, d := range hdrs { +func (e *endpoint) WritePackets(r *stack.Route, gso *stack.GSO, pkts []tcpip.PacketBuffer, protocol tcpip.NetworkProtocolNumber) (int, *tcpip.Error) { + view := pkts[0].Data.ToView() + for _, pkt := range pkts { e.dumpPacket(gso, protocol, tcpip.PacketBuffer{ - Header: d.Hdr, - Data: view[d.Off:][:d.Size].ToVectorisedView(), + Header: pkt.Header, + Data: view[pkt.DataOffset:][:pkt.DataSize].ToVectorisedView(), }) } - return e.lower.WritePackets(r, gso, hdrs, payload, protocol) + return e.lower.WritePackets(r, gso, pkts, protocol) } // WriteRawPacket implements stack.LinkEndpoint.WriteRawPacket. |