SagerNet/sing-tun
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-tun.git synced 2025-04-04 20:37:43 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update gVisor to 20220801.0

Browse source
This commit is contained in:
世界 2022-08-07 14:52:53 +08:00
parent 3edb69544e
commit 4c11eaac36
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
5 changed files with 51 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gvisor_udp.go
View file

@ -13,7 +13,7 @@ import (
N "github.com/sagernet/sing/common/network"
"github.com/sagernet/sing/common/udpnat"
gBuffer "gvisor.dev/gvisor/pkg/buffer"
"gvisor.dev/gvisor/pkg/bufferv2"
"gvisor.dev/gvisor/pkg/tcpip"
"gvisor.dev/gvisor/pkg/tcpip/header"
"gvisor.dev/gvisor/pkg/tcpip/stack"
@ -43,7 +43,7 @@ func (f *UDPForwarder) HandlePacket(id stack.TransportEndpointID, pkt *stack.Pac
f.udpNat.NewPacket(
f.ctx,
upstreamMetadata.Source.AddrPort(),
buf.As(pkt.Data().AsRange().AsView()),
buf.As(pkt.Data().AsRange().ToSlice()),
upstreamMetadata,
func(natConn N.PacketConn) N.PacketWriter {
return &UDPBackWriter{f.stack, id.RemoteAddress, id.RemotePort}
@ -58,9 +58,6 @@ type UDPBackWriter struct {
sourcePort uint16
}
func (w *UDPBackWriter) WriteIsThreadUnsafe() {
}
func (w *UDPBackWriter) WritePacket(buffer *buf.Buffer, destination M.Socksaddr) error {
defer buffer.Release()
@ -85,8 +82,7 @@ func (w *UDPBackWriter) WritePacket(buffer *buf.Buffer, destination M.Socksaddr)
packet := stack.NewPacketBuffer(stack.PacketBufferOptions{
ReserveHeaderBytes: header.UDPMinimumSize + int(route.MaxHeaderLength()),
Payload: gBuffer.NewWithData(buffer.Bytes()),
OnRelease: buffer.Release,
Payload: bufferv2.MakeWithData(buffer.Bytes()),
})
defer packet.DecRef()