From ac701dd9a3e450be10580886ac8fe73609c139eb Mon Sep 17 00:00:00 2001 From: Vasyl Gello Date: Thu, 16 Nov 2023 13:42:16 +0200 Subject: [PATCH] Switch tcpip netstack back to upstream * Replace gvisor.dev/gvisor/pkg/tcpip/buffer with gvisor.dev/gvisor/pkg/buffer * Use go branch of gvisor.dev/gvisor: go get -d gvisor.dev/gvisor@go Signed-off-by: Vasyl Gello --- contrib/netstack/netstack.go | 14 +++++++------- contrib/netstack/yggdrasil.go | 10 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/contrib/netstack/netstack.go b/contrib/netstack/netstack.go index 3bd11575..791dc4b4 100644 --- a/contrib/netstack/netstack.go +++ b/contrib/netstack/netstack.go @@ -8,13 +8,13 @@ import ( "github.com/yggdrasil-network/yggdrasil-go/src/core" - "inet.af/netstack/tcpip" - "inet.af/netstack/tcpip/adapters/gonet" - "inet.af/netstack/tcpip/network/ipv6" - "inet.af/netstack/tcpip/stack" - "inet.af/netstack/tcpip/transport/icmp" - "inet.af/netstack/tcpip/transport/tcp" - "inet.af/netstack/tcpip/transport/udp" + "gvisor.dev/gvisor/pkg/tcpip" + "gvisor.dev/gvisor/pkg/tcpip/adapters/gonet" + "gvisor.dev/gvisor/pkg/tcpip/network/ipv6" + "gvisor.dev/gvisor/pkg/tcpip/stack" + "gvisor.dev/gvisor/pkg/tcpip/transport/icmp" + "gvisor.dev/gvisor/pkg/tcpip/transport/tcp" + "gvisor.dev/gvisor/pkg/tcpip/transport/udp" ) type YggdrasilNetstack struct { diff --git a/contrib/netstack/yggdrasil.go b/contrib/netstack/yggdrasil.go index 02228bd2..9375128f 100644 --- a/contrib/netstack/yggdrasil.go +++ b/contrib/netstack/yggdrasil.go @@ -7,11 +7,11 @@ import ( "github.com/yggdrasil-network/yggdrasil-go/src/core" "github.com/yggdrasil-network/yggdrasil-go/src/ipv6rwc" - "inet.af/netstack/tcpip" - "inet.af/netstack/tcpip/buffer" - "inet.af/netstack/tcpip/header" - "inet.af/netstack/tcpip/network/ipv6" - "inet.af/netstack/tcpip/stack" + "gvisor.dev/gvisor/pkg/buffer" + "gvisor.dev/gvisor/pkg/tcpip" + "gvisor.dev/gvisor/pkg/tcpip/header" + "gvisor.dev/gvisor/pkg/tcpip/network/ipv6" + "gvisor.dev/gvisor/pkg/tcpip/stack" ) type YggdrasilNIC struct {