From 2841aea86cee81291fed5c960251325771105710 Mon Sep 17 00:00:00 2001 From: JackDoan Date: Thu, 14 May 2026 12:16:33 -0500 Subject: [PATCH] fixes --- overlay/overlaytest/noop.go | 5 +++-- overlay/tun_freebsd.go | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/overlay/overlaytest/noop.go b/overlay/overlaytest/noop.go index f7c77478..f3b50910 100644 --- a/overlay/overlaytest/noop.go +++ b/overlay/overlaytest/noop.go @@ -8,6 +8,7 @@ import ( "github.com/slackhq/nebula/overlay/tio" "github.com/slackhq/nebula/routing" + "github.com/slackhq/nebula/wire" ) // NoopTun is an overlay.Device that silently discards every read and write. @@ -35,8 +36,8 @@ func (NoopTun) Name() string { return "noop" } -func (NoopTun) Read() ([]tio.Packet, error) { - return nil, nil +func (NoopTun) Read(p []wire.TunPacket, mem []byte) (int, error) { + return 0, nil } func (NoopTun) Write([]byte) (int, error) { diff --git a/overlay/tun_freebsd.go b/overlay/tun_freebsd.go index b67cde40..0effb6c0 100644 --- a/overlay/tun_freebsd.go +++ b/overlay/tun_freebsd.go @@ -166,7 +166,7 @@ func (t *tun) Read(p []wire.TunPacket, mem []byte) (int, error) { if err != nil { return 0, err } - p[0].Bytes = mem[4:n] + p[0].Bytes = mem[:n] return 1, nil }