mirrors
/
tailscale
mirror of https://github.com/tailscale/tailscale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net/tstun: use p.Buffer() in more places 

Updates tailscale/corp#8020

Signed-off-by: Maisem Ali <maisem@tailscale.com>
This commit is contained in:
Maisem Ali 2023-03-21 15:07:40 -07:00 committed by Maisem Ali
parent f6ea6863de
commit 0bf8c8e710
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/tstun/wrap.go
View File

@ -713,7 +713,7 @@ func (t *Wrapper) Read(buffs [][]byte, sizes []int, offset int) (int, error) {
} }
} }
if capt := t.captureHook.Load(); capt != nil { if capt := t.captureHook.Load(); capt != nil {
capt(capture.FromLocal, time.Now(), data[res.dataOffset:]) capt(capture.FromLocal, time.Now(), p.Buffer())
} }
if !t.disableFilter { if !t.disableFilter {
response := t.filterPacketOutboundToWireGuard(p) response := t.filterPacketOutboundToWireGuard(p)
@ -722,13 +722,13 @@ func (t *Wrapper) Read(buffs [][]byte, sizes []int, offset int) (int, error) {
continue continue
} }
} }
n := copy(buffs[buffsPos][offset:], data[res.dataOffset:]) n := copy(buffs[buffsPos][offset:], p.Buffer())
if n != len(data)-res.dataOffset { if n != len(data)-res.dataOffset {
panic(fmt.Sprintf("short copy: %d != %d", n, len(data)-res.dataOffset)) panic(fmt.Sprintf("short copy: %d != %d", n, len(data)-res.dataOffset))
} }
sizes[buffsPos] = n sizes[buffsPos] = n
if stats := t.stats.Load(); stats != nil { if stats := t.stats.Load(); stats != nil {
stats.UpdateTxVirtual(data[res.dataOffset:]) stats.UpdateTxVirtual(p.Buffer())
} }
buffsPos++ buffsPos++
} }
@ -942,12 +942,12 @@ func (t *Wrapper) InjectInboundPacketBuffer(pkt stack.PacketBufferPtr) error {
} }
pkt.DecRef() pkt.DecRef()
if capt := t.captureHook.Load(); capt != nil {
capt(capture.SynthesizedToLocal, time.Now(), buf[PacketStartOffset:])
}
p := parsedPacketPool.Get().(*packet.Parsed) p := parsedPacketPool.Get().(*packet.Parsed)
defer parsedPacketPool.Put(p) defer parsedPacketPool.Put(p)
p.Decode(buf[PacketStartOffset:]) p.Decode(buf[PacketStartOffset:])
if capt := t.captureHook.Load(); capt != nil {
capt(capture.SynthesizedToLocal, time.Now(), p.Buffer())
}
t.dnatV4(p) t.dnatV4(p)
return t.InjectInboundDirect(buf, PacketStartOffset) return t.InjectInboundDirect(buf, PacketStartOffset)