Skip to content

Commit e26adb8

Browse files
raggiraggi
committed
go.mod,tun/netstack: bump gvisor
Signed-off-by: James Tucker <[email protected]>
1 parent bd7e9d3 commit e26adb8

File tree

4 files changed

+26
-26
lines changed

4 files changed

+26
-26
lines changed

‎go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ module github.com/tailscale/wireguard-go
33
go 1.20
44

55
require (
6-
golang.org/x/crypto v0.6.0
7-
golang.org/x/net v0.7.0
8-
golang.org/x/sys v0.5.1-0.20230222185716-a3b23cc77e89
6+
golang.org/x/crypto v0.13.0
7+
golang.org/x/net v0.15.0
8+
golang.org/x/sys v0.12.0
99
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2
10-
gvisor.dev/gvisor v0.0.0-20221203005347-703fd9b7fbc0
10+
gvisor.dev/gvisor v0.0.0-20230927004350-cbd86285d259
1111
)
1212

1313
require (
1414
github.com/google/btree v1.0.1 // indirect
15-
golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
15+
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
1616
)

‎go.sum

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4=
22
github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA=
3-
golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
4-
golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
5-
golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
6-
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
7-
golang.org/x/sys v0.5.1-0.20230222185716-a3b23cc77e89 h1:260HNjMTPDya+jq5AM1zZLgG9pv9GASPAGiEEJUbRg4=
8-
golang.org/x/sys v0.5.1-0.20230222185716-a3b23cc77e89/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
9-
golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs=
10-
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
3+
golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck=
4+
golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
5+
golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8=
6+
golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
7+
golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
8+
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
9+
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 h1:vVKdlvoWBphwdxWKrFZEuM0kGgGLxUOYcY4U/2Vjg44=
10+
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
1111
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 h1:B82qJJgjvYKsXS9jeunTOisW56dUokqW/FOteYJJ/yg=
1212
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2/go.mod h1:deeaetjYA+DHMHg+sMSMI58GrEteJUUzzw7en6TJQcI=
13-
gvisor.dev/gvisor v0.0.0-20221203005347-703fd9b7fbc0 h1:Wobr37noukisGxpKo5jAsLREcpj61RxrWYzD8uwveOY=
14-
gvisor.dev/gvisor v0.0.0-20221203005347-703fd9b7fbc0/go.mod h1:Dn5idtptoW1dIos9U6A2rpebLs/MtTwFacjKb8jLdQA=
13+
gvisor.dev/gvisor v0.0.0-20230927004350-cbd86285d259 h1:TbRPT0HtzFP3Cno1zZo7yPzEEnfu8EjLfl6IU9VfqkQ=
14+
gvisor.dev/gvisor v0.0.0-20230927004350-cbd86285d259/go.mod h1:AVgIgHMwK63XvmAzWG9vLQ41YnVHN0du0tEC46fI7yY=

‎tun/netstack/tun.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"github.com/tailscale/wireguard-go/tun"
2626

2727
"golang.org/x/net/dns/dnsmessage"
28-
"gvisor.dev/gvisor/pkg/bufferv2"
28+
"gvisor.dev/gvisor/pkg/buffer"
2929
"gvisor.dev/gvisor/pkg/tcpip"
3030
"gvisor.dev/gvisor/pkg/tcpip/adapters/gonet"
3131
"gvisor.dev/gvisor/pkg/tcpip/header"
@@ -43,7 +43,7 @@ type netTun struct {
4343
ep *channel.Endpoint
4444
stack *stack.Stack
4545
events chan tun.Event
46-
incomingPacket chan *bufferv2.View
46+
incomingPacket chan *buffer.View
4747
mtu int
4848
dnsServers []netip.Addr
4949
hasV4, hasV6 bool
@@ -61,7 +61,7 @@ func CreateNetTUN(localAddresses, dnsServers []netip.Addr, mtu int) (tun.Device,
6161
ep: channel.New(1024, uint32(mtu), ""),
6262
stack: stack.New(opts),
6363
events: make(chan tun.Event, 10),
64-
incomingPacket: make(chan *bufferv2.View),
64+
incomingPacket: make(chan *buffer.View),
6565
dnsServers: dnsServers,
6666
mtu: mtu,
6767
}
@@ -84,7 +84,7 @@ func CreateNetTUN(localAddresses, dnsServers []netip.Addr, mtu int) (tun.Device,
8484
}
8585
protoAddr := tcpip.ProtocolAddress{
8686
Protocol: protoNumber,
87-
AddressWithPrefix: tcpip.Address(ip.AsSlice()).WithPrefix(),
87+
AddressWithPrefix: tcpip.AddrFromSlice(ip.AsSlice()).WithPrefix(),
8888
}
8989
tcpipErr := dev.stack.AddProtocolAddress(1, protoAddr, stack.AddressProperties{})
9090
if tcpipErr != nil {
@@ -140,7 +140,7 @@ func (tun *netTun) Write(buf [][]byte, offset int) (int, error) {
140140
continue
141141
}
142142

143-
pkb := stack.NewPacketBuffer(stack.PacketBufferOptions{Payload: bufferv2.MakeWithData(packet)})
143+
pkb := stack.NewPacketBuffer(stack.PacketBufferOptions{Payload: buffer.MakeWithData(packet)})
144144
switch packet[0] >> 4 {
145145
case 4:
146146
tun.ep.InjectInbound(header.IPv4ProtocolNumber, pkb)
@@ -198,7 +198,7 @@ func convertToFullAddr(endpoint netip.AddrPort) (tcpip.FullAddress, tcpip.Networ
198198
}
199199
return tcpip.FullAddress{
200200
NIC: 1,
201-
Addr: tcpip.Address(endpoint.Addr().AsSlice()),
201+
Addr: tcpip.AddrFromSlice(endpoint.Addr().AsSlice()),
202202
Port: endpoint.Port(),
203203
}, protoNumber
204204
}
@@ -453,7 +453,7 @@ func (pc *PingConn) ReadFrom(p []byte) (n int, addr net.Addr, err error) {
453453
return 0, nil, fmt.Errorf("ping read: %s", tcpipErr)
454454
}
455455

456-
remoteAddr, _ := netip.AddrFromSlice([]byte(res.RemoteAddr.Addr))
456+
remoteAddr, _ := netip.AddrFromSlice(res.RemoteAddr.Addr.AsSlice())
457457
return res.Count, &PingAddr{remoteAddr}, nil
458458
}
459459

‎tun/tcp_offload_linux_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ func tcp4PacketMutateIPFields(srcIPPort, dstIPPort netip.AddrPort, flags header.
3535
srcAs4 := srcIPPort.Addr().As4()
3636
dstAs4 := dstIPPort.Addr().As4()
3737
ipFields := &header.IPv4Fields{
38-
SrcAddr: tcpip.Address(srcAs4[:]),
39-
DstAddr: tcpip.Address(dstAs4[:]),
38+
SrcAddr: tcpip.AddrFromSlice(srcAs4[:]),
39+
DstAddr: tcpip.AddrFromSlice(dstAs4[:]),
4040
Protocol: unix.IPPROTO_TCP,
4141
TTL: 64,
4242
TotalLength: uint16(totalLen),
@@ -72,8 +72,8 @@ func tcp6PacketMutateIPFields(srcIPPort, dstIPPort netip.AddrPort, flags header.
7272
srcAs16 := srcIPPort.Addr().As16()
7373
dstAs16 := dstIPPort.Addr().As16()
7474
ipFields := &header.IPv6Fields{
75-
SrcAddr: tcpip.Address(srcAs16[:]),
76-
DstAddr: tcpip.Address(dstAs16[:]),
75+
SrcAddr: tcpip.AddrFromSlice(srcAs16[:]),
76+
DstAddr: tcpip.AddrFromSlice(dstAs16[:]),
7777
TransportProtocol: unix.IPPROTO_TCP,
7878
HopLimit: 64,
7979
PayloadLength: uint16(segmentSize + 20),

0 commit comments

Comments
 (0)