diff options
| author | Kevin Krakauer <krakauer@google.com> | 2020-04-13 17:37:21 -0700 |
|---|---|---|
| committer | Kevin Krakauer <krakauer@google.com> | 2020-04-17 13:25:57 -0700 |
| commit | a551add5d8a5bf631cd9859c761e579fdb33ec82 (patch) | |
| tree | 44563f8173fe203da367d47bf3aca633dbbba76c /pkg/tcpip/network/arp | |
| parent | 80deebb0bfde2a53c943deb8d8473239bb6de3eb (diff) | |
Remove View.First() and View.RemoveFirst()
These methods let users eaily break the VectorisedView abstraction, and
allowed netstack to slip into pseudo-enforcement of the "all headers are
in the first View" invariant. Removing them and replacing with PullUp(n)
breaks this reliance and will make it easier to add iptables support and
rework network buffer management.
The new View.PullUp(n) method is low cost in the common case, when when
all the headers fit in the first View.
Diffstat (limited to 'pkg/tcpip/network/arp')
| -rw-r--r-- | pkg/tcpip/network/arp/arp.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkg/tcpip/network/arp/arp.go b/pkg/tcpip/network/arp/arp.go index 7acbfa0a8..cf73a939e 100644 --- a/pkg/tcpip/network/arp/arp.go +++ b/pkg/tcpip/network/arp/arp.go @@ -93,7 +93,10 @@ func (e *endpoint) WriteHeaderIncludedPacket(r *stack.Route, pkt stack.PacketBuf } func (e *endpoint) HandlePacket(r *stack.Route, pkt stack.PacketBuffer) { - v := pkt.Data.First() + v, ok := pkt.Data.PullUp(header.ARPSize) + if !ok { + return + } h := header.ARP(v) if !h.IsValid() { return |