Skip to content

Commit 3185844

Browse files
nekohasekainekohasekai
committed
Update gvisor to 20241007.0
1 parent 07278fb commit 3185844

File tree

4 files changed

+39
-15
lines changed

4 files changed

+39
-15
lines changed

‎go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@ go 1.20
55
require (
66
github.com/go-ole/go-ole v1.3.0
77
github.com/sagernet/fswatch v0.1.1
8-
github.com/sagernet/gvisor v0.0.0-20240428053021-e691de28565f
8+
github.com/sagernet/gvisor v0.0.0-20241019061641-46bad1ee6ecc
99
github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a
1010
github.com/sagernet/nftables v0.3.0-beta.4
11-
github.com/sagernet/sing v0.5.0-rc.2
11+
github.com/sagernet/sing v0.5.0-rc.4
1212
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba
1313
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8
1414
golang.org/x/net v0.26.0
15-
golang.org/x/sys v0.21.0
15+
golang.org/x/sys v0.26.0
1616
)
1717

1818
require (
1919
github.com/fsnotify/fsnotify v1.7.0 // indirect
20-
github.com/google/btree v1.1.2 // indirect
20+
github.com/google/btree v1.1.3 // indirect
2121
github.com/google/go-cmp v0.6.0 // indirect
2222
github.com/josharian/native v1.1.0 // indirect
2323
github.com/mdlayher/netlink v1.7.2 // indirect
2424
github.com/mdlayher/socket v0.4.1 // indirect
2525
github.com/vishvananda/netns v0.0.4 // indirect
2626
golang.org/x/sync v0.7.0 // indirect
27-
golang.org/x/time v0.5.0 // indirect
27+
golang.org/x/time v0.7.0 // indirect
2828
)

‎go.sum‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nos
33
github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
44
github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
55
github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
6-
github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU=
7-
github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
6+
github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=
7+
github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
88
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
99
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
1010
github.com/josharian/native v1.1.0 h1:uuaP0hAbW7Y4l0ZRQ6C9zfb7Mg1mbFKry/xzDAfmtLA=
@@ -16,14 +16,14 @@ github.com/mdlayher/socket v0.4.1/go.mod h1:cAqeGjoufqdxWkD7DkpyS+wcefOtmu5OQ8Ku
1616
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
1717
github.com/sagernet/fswatch v0.1.1 h1:YqID+93B7VRfqIH3PArW/XpJv5H4OLEVWDfProGoRQs=
1818
github.com/sagernet/fswatch v0.1.1/go.mod h1:nz85laH0mkQqJfaOrqPpkwtU1znMFNVTpT/5oRsVz/o=
19-
github.com/sagernet/gvisor v0.0.0-20240428053021-e691de28565f h1:NkhuupzH5ch7b/Y/6ZHJWrnNLoiNnSJaow6DPb8VW2I=
20-
github.com/sagernet/gvisor v0.0.0-20240428053021-e691de28565f/go.mod h1:KXmw+ouSJNOsuRpg4wgwwCQuunrGz4yoAqQjsLjc6N0=
19+
github.com/sagernet/gvisor v0.0.0-20241019061641-46bad1ee6ecc h1:IvmeRstYX63O0QpLGJgVOaaM21ZIG0frJi6MT29Irtk=
20+
github.com/sagernet/gvisor v0.0.0-20241019061641-46bad1ee6ecc/go.mod h1:ehZwnT2UpmOWAHFL48XdBhnd4Qu4hN2O3Ji0us3ZHMw=
2121
github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a h1:ObwtHN2VpqE0ZNjr6sGeT00J8uU7JF4cNUdb44/Duis=
2222
github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a/go.mod h1:xLnfdiJbSp8rNqYEdIW/6eDO4mVoogml14Bh2hSiFpM=
2323
github.com/sagernet/nftables v0.3.0-beta.4 h1:kbULlAwAC3jvdGAC1P5Fa3GSxVwQJibNenDW2zaXr8I=
2424
github.com/sagernet/nftables v0.3.0-beta.4/go.mod h1:OQXAjvjNGGFxaTgVCSTRIhYB5/llyVDeapVoENYBDS8=
25-
github.com/sagernet/sing v0.5.0-rc.2 h1:tIrs6pRbjJWvI0ITRSg47P1wosY+iSuHpw9t5/hBx+Q=
26-
github.com/sagernet/sing v0.5.0-rc.2/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak=
25+
github.com/sagernet/sing v0.5.0-rc.4 h1:pnZQz9leyY2nckGvOG0AUcBIyHOCrapwBd63qmP1hSk=
26+
github.com/sagernet/sing v0.5.0-rc.4/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak=
2727
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
2828
github.com/vishvananda/netns v0.0.4 h1:Oeaw1EM2JMxD51g9uhtC0D7erkIjgmj8+JZc26m1YX8=
2929
github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
@@ -36,8 +36,8 @@ golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
3636
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
3737
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
3838
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
39-
golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
40-
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
41-
golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
42-
golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
39+
golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
40+
golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
41+
golang.org/x/time v0.7.0 h1:ntUhktv3OPE6TgYxXWv9vKvUSJyIFJlyohwbkEwPrKQ=
42+
golang.org/x/time v0.7.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
4343
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

‎tun_darwin_gvisor.go‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ func (e *DarwinEndpoint) MTU() uint32 {
2727
return e.tun.mtu
2828
}
2929

30+
func (e *DarwinEndpoint) SetMTU(mtu uint32) {
31+
}
32+
3033
func (e *DarwinEndpoint) MaxHeaderLength() uint16 {
3134
return 0
3235
}
@@ -35,6 +38,9 @@ func (e *DarwinEndpoint) LinkAddress() tcpip.LinkAddress {
3538
return ""
3639
}
3740

41+
func (e *DarwinEndpoint) SetLinkAddress(addr tcpip.LinkAddress) {
42+
}
43+
3844
func (e *DarwinEndpoint) Capabilities() stack.LinkEndpointCapabilities {
3945
return stack.CapabilityRXChecksumOffload
4046
}
@@ -120,3 +126,9 @@ func (e *DarwinEndpoint) WritePackets(packetBufferList stack.PacketBufferList) (
120126
}
121127
return n, nil
122128
}
129+
130+
func (e *DarwinEndpoint) Close() {
131+
}
132+
133+
func (e *DarwinEndpoint) SetOnCloseAction(f func()) {
134+
}

‎tun_windows_gvisor.go‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ func (e *WintunEndpoint) MTU() uint32 {
2626
return e.tun.options.MTU
2727
}
2828

29+
func (e *WintunEndpoint) SetMTU(mtu uint32) {
30+
}
31+
2932
func (e *WintunEndpoint) MaxHeaderLength() uint16 {
3033
return 0
3134
}
@@ -34,6 +37,9 @@ func (e *WintunEndpoint) LinkAddress() tcpip.LinkAddress {
3437
return ""
3538
}
3639

40+
func (e *WintunEndpoint) SetLinkAddress(addr tcpip.LinkAddress) {
41+
}
42+
3743
func (e *WintunEndpoint) Capabilities() stack.LinkEndpointCapabilities {
3844
return stack.CapabilityRXChecksumOffload
3945
}
@@ -117,3 +123,9 @@ func (e *WintunEndpoint) WritePackets(packetBufferList stack.PacketBufferList) (
117123
}
118124
return n, nil
119125
}
126+
127+
func (e *WintunEndpoint) Close() {
128+
}
129+
130+
func (e *WintunEndpoint) SetOnCloseAction(f func()) {
131+
}

0 commit comments

Comments
 (0)