Skip to content

tun: replace use of binary package with copy() in virtioNetHdr encoding #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jwhited merged 1 commit into from
Dec 19, 2022
Merged

tun: replace use of binary package with copy() in virtioNetHdr encoding #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions endian/big.go
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions endian/little.go
View file
Open in desktop

This file was deleted.

15 changes: 2 additions & 13 deletions tun/tcp_offload_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"unsafe"

"github.com/tailscale/wireguard-go/conn"
"github.com/tailscale/wireguard-go/endian"
"golang.org/x/sys/unix"
)

Expand Down Expand Up @@ -50,25 +49,15 @@ func (v *virtioNetHdr) decode(b []byte) error {
if len(b) < virtioNetHdrLen {
return errors.New("too short")
}
v.flags = b[0]
v.gsoType = b[1]
v.hdrLen = endian.Native.Uint16(b[2:])
v.gsoSize = endian.Native.Uint16(b[4:])
v.csumStart = endian.Native.Uint16(b[6:])
v.csumOffset = endian.Native.Uint16(b[8:])
copy(unsafe.Slice((*byte)(unsafe.Pointer(v)), virtioNetHdrLen), b[:virtioNetHdrLen])
return nil
}

func (v *virtioNetHdr) encode(b []byte) error {
if len(b) < virtioNetHdrLen {
return errors.New("too short")
}
b[0] = v.flags
b[1] = v.gsoType
endian.Native.PutUint16(b[2:], v.hdrLen)
endian.Native.PutUint16(b[4:], v.gsoSize)
endian.Native.PutUint16(b[6:], v.csumStart)
endian.Native.PutUint16(b[8:], v.csumOffset)
copy(b[:virtioNetHdrLen], unsafe.Slice((*byte)(unsafe.Pointer(v)), virtioNetHdrLen))
return nil
}

Expand Down