Ability to use newer gvisor's API

diff --git a/src/go.mod b/src/go.mod
index 26b0315332ba26f8a0e435242922b1141d54465f..a77fbc7c975736c36a9744e5320a0131d21c91e0 100644 (file)
--- a/src/go.mod
+++ b/src/go.mod
@@ -17,7 +17,7 @@ require (
        golang.org/x/net v0.2.0
        golang.org/x/sys v0.2.0
        golang.org/x/term v0.2.0
-       gvisor.dev/gvisor v0.0.0-20220901235040-6ca97ef2ce1c
+       gvisor.dev/gvisor v0.0.0-20221117225851-0a8c1909f4b6
        lukechampine.com/blake3 v1.1.7
 )
 

diff --git a/src/go.sum b/src/go.sum
index 53d4cc9741d31b014592cd0a078a67c9cdbcc882..2eea7d7d0ca48318329333cefbf704627bb55b5d 100644 (file)
--- a/src/go.sum
+++ b/src/go.sum
@@ -55,7 +55,7 @@ golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxb
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gvisor.dev/gvisor v0.0.0-20220901235040-6ca97ef2ce1c h1:m5lcgWnL3OElQNVyp3qcncItJ2c0sQlSGjYK2+nJTA4=
-gvisor.dev/gvisor v0.0.0-20220901235040-6ca97ef2ce1c/go.mod h1:TIvkJD0sxe8pIob3p6T8IzxXunlp6yfgktvTNp+DGNM=
+gvisor.dev/gvisor v0.0.0-20221117225851-0a8c1909f4b6 h1:ya0ge5cqvaD+mfZMra0doe2/q0XtT5kL0gtVAoUj1OE=
+gvisor.dev/gvisor v0.0.0-20221117225851-0a8c1909f4b6/go.mod h1:GTnb0ivEcnuJ0oQIvflL9FeMtkzsTPi+7bxBh4HwHEs=
 lukechampine.com/blake3 v1.1.7 h1:GgRMhmdsuK8+ii6UZFDL8Nb+VyMwadAgcJyfYHxG6n0=
 lukechampine.com/blake3 v1.1.7/go.mod h1:tkKEOtDkNtklkXtLNEOGNq5tcV90tJiA1vAA12R78LA=

diff --git a/src/yggdrasil/tcpip.go b/src/yggdrasil/tcpip.go
index a1a71acd3eab4fae041ad22e5a16d9c764bd4b4c..e7c4944d290ce0cd3d9a0c951717ef5b8cab57fb 100644 (file)
--- a/src/yggdrasil/tcpip.go
+++ b/src/yggdrasil/tcpip.go
@@ -68,7 +68,7 @@ func (*TCPIPEndpoint) LinkAddress() tcpip.LinkAddress { return "" }
 
 func (*TCPIPEndpoint) Wait() {}
 
-func (e *TCPIPEndpoint) WritePacket(pkt *stack.PacketBuffer) tcpip.Error {
+func (e *TCPIPEndpoint) WritePacket(pkt stack.PacketBufferPtr) tcpip.Error {
        v := pkt.ToView()
        n, err := v.Read(e.writeBuf)
        if err != nil {
@@ -99,13 +99,9 @@ func (e *TCPIPEndpoint) WritePackets(pbs stack.PacketBufferList) (int, tcpip.Err
        return len(pbs.AsSlice()), nil
 }
 
-func (e *TCPIPEndpoint) WriteRawPacket(*stack.PacketBuffer) tcpip.Error {
-       panic("not implemented")
-}
-
 func (*TCPIPEndpoint) ARPHardwareType() header.ARPHardwareType { return header.ARPHardwareNone }
 
-func (e *TCPIPEndpoint) AddHeader(*stack.PacketBuffer) {}
+func (e *TCPIPEndpoint) AddHeader(stack.PacketBufferPtr) {}
 
 func convertToFullAddr(ip net.IP, port int) (tcpip.FullAddress, tcpip.NetworkProtocolNumber) {
        return tcpip.FullAddress{