summaryrefslogtreecommitdiffhomepage
path: root/tun
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2021-10-11 14:57:53 -0600
committerJason A. Donenfeld <Jason@zx2c4.com>2021-10-11 14:57:53 -0600
commit982d5d2e84910cd29d52b97cfbe733fd56fd04ef (patch)
tree5866399b5c7741a7a056d56c8779b26202dbd88d /tun
parent642a56e165e74a518fe986c2cf93dea62d6029b5 (diff)
conn,wintun: use unsafe.Slice instead of unsafeSlice
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'tun')
-rw-r--r--tun/wintun/session_windows.go22
1 files changed, 2 insertions, 20 deletions
diff --git a/tun/wintun/session_windows.go b/tun/wintun/session_windows.go
index ffa9380..f023baf 100644
--- a/tun/wintun/session_windows.go
+++ b/tun/wintun/session_windows.go
@@ -67,7 +67,7 @@ func (session Session) ReceivePacket() (packet []byte, err error) {
err = e1
return
}
- unsafeSlice(unsafe.Pointer(&packet), unsafe.Pointer(r0), int(packetSize))
+ packet = unsafe.Slice((*byte)(unsafe.Pointer(r0)), packetSize)
return
}
@@ -81,28 +81,10 @@ func (session Session) AllocateSendPacket(packetSize int) (packet []byte, err er
err = e1
return
}
- unsafeSlice(unsafe.Pointer(&packet), unsafe.Pointer(r0), int(packetSize))
+ packet = unsafe.Slice((*byte)(unsafe.Pointer(r0)), packetSize)
return
}
func (session Session) SendPacket(packet []byte) {
syscall.Syscall(procWintunSendPacket.Addr(), 2, session.handle, uintptr(unsafe.Pointer(&packet[0])), 0)
}
-
-// unsafeSlice updates the slice slicePtr to be a slice
-// referencing the provided data with its length & capacity set to
-// lenCap.
-//
-// TODO: when Go 1.16 or Go 1.17 is the minimum supported version,
-// update callers to use unsafe.Slice instead of this.
-func unsafeSlice(slicePtr, data unsafe.Pointer, lenCap int) {
- type sliceHeader struct {
- Data unsafe.Pointer
- Len int
- Cap int
- }
- h := (*sliceHeader)(slicePtr)
- h.Data = data
- h.Len = lenCap
- h.Cap = lenCap
-}