diff options
author | gVisor bot <gvisor-bot@google.com> | 2021-07-28 22:43:52 -0700 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2021-07-28 22:46:06 -0700 |
commit | 095b0d8348531b96f1b40885c00d6cd7f07ecf80 (patch) | |
tree | f3429ef1d1a77f83e5a6907d6a501a5c606aebc9 /pkg/tcpip/link/sniffer/sniffer.go | |
parent | 72c2b74ac3c145818e994326775d503d6ba0e368 (diff) |
Explicitly encode the pcap packet headers to reduce CPU cost of pcap generation.
PiperOrigin-RevId: 387513118
Diffstat (limited to 'pkg/tcpip/link/sniffer/sniffer.go')
-rw-r--r-- | pkg/tcpip/link/sniffer/sniffer.go | 33 |
1 files changed, 8 insertions, 25 deletions
diff --git a/pkg/tcpip/link/sniffer/sniffer.go b/pkg/tcpip/link/sniffer/sniffer.go index 3df826f3c..28a172e71 100644 --- a/pkg/tcpip/link/sniffer/sniffer.go +++ b/pkg/tcpip/link/sniffer/sniffer.go @@ -151,33 +151,16 @@ func (e *endpoint) dumpPacket(dir direction, protocol tcpip.NetworkProtocolNumbe logPacket(e.logPrefix, dir, protocol, pkt) } if writer != nil && atomic.LoadUint32(&LogPacketsToPCAP) == 1 { - totalLength := pkt.Size() - length := totalLength - if max := int(e.maxPCAPLen); length > max { - length = max + packet := pcapPacket{ + timestamp: time.Now(), + packet: pkt, + maxCaptureLen: int(e.maxPCAPLen), } - packetHeader := newPCAPPacketHeader(time.Now(), uint32(length), uint32(totalLength)) - packet := make([]byte, binary.Size(packetHeader)+length) - { - writer := tcpip.SliceWriter(packet) - if err := binary.Write(&writer, binary.BigEndian, packetHeader); err != nil { - panic(err) - } - for _, b := range pkt.Views() { - if length == 0 { - break - } - if len(b) > length { - b = b[:length] - } - n, err := writer.Write(b) - if err != nil { - panic(err) - } - length -= n - } + b, err := packet.MarshalBinary() + if err != nil { + panic(err) } - if _, err := writer.Write(packet); err != nil { + if _, err := writer.Write(b); err != nil { panic(err) } } |