eburet-oss/sing-tun-lx
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve gVisor UDP

Browse source
This commit is contained in:
世界 2023-07-23 14:01:36 +08:00
parent fd850d00e5
commit bbf542f01a
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
4 changed files with 28 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

32
gvisor_udp.go
View file

@ -23,6 +23,11 @@ type UDPForwarder struct {
ctx context.Context
stack *stack.Stack
udpNat *udpnat.Service[netip.AddrPort]
// cache
cacheProto tcpip.NetworkProtocolNumber
cacheID stack.TransportEndpointID
cachePacket stack.PacketBufferPtr
}
func NewUDPForwarder(ctx context.Context, stack *stack.Stack, handler Handler, udpTimeout int64) *UDPForwarder {
@ -37,24 +42,37 @@ func (f *UDPForwarder) HandlePacket(id stack.TransportEndpointID, pkt stack.Pack
var upstreamMetadata M.Metadata
upstreamMetadata.Source = M.SocksaddrFrom(AddrFromAddress(id.RemoteAddress), id.RemotePort)
upstreamMetadata.Destination = M.SocksaddrFrom(AddrFromAddress(id.LocalAddress), id.LocalPort)
var netProto tcpip.NetworkProtocolNumber
if upstreamMetadata.Source.IsIPv4() {
netProto = header.IPv4ProtocolNumber
f.cacheProto = header.IPv4ProtocolNumber
} else {
netProto = header.IPv6ProtocolNumber
f.cacheProto = header.IPv6ProtocolNumber
}
gBuffer := pkt.ToBuffer()
sBuffer := buf.NewSize(int(gBuffer.Size()))
gBuffer.Apply(func(view *buffer.View) {
sBuffer.Write(view.AsSlice())
})
f.cacheID = id
f.cachePacket = pkt
f.udpNat.NewPacket(
f.ctx,
upstreamMetadata.Source.AddrPort(),
buf.As(pkt.Data().AsRange().ToSlice()),
sBuffer,
upstreamMetadata,
func(natConn N.PacketConn) N.PacketWriter {
return &UDPBackWriter{f.stack, id.RemoteAddress, id.RemotePort, netProto}
},
f.newUDPConn,
)
return true
}
func (f *UDPForwarder) newUDPConn(natConn N.PacketConn) N.PacketWriter {
return &UDPBackWriter{
stack: f.stack,
source: f.cacheID.RemoteAddress,
sourcePort: f.cacheID.RemotePort,
sourceNetwork: f.cacheProto,
}
}
type UDPBackWriter struct {
stack *stack.Stack
source tcpip.Address

2
lwip.go
View file

@ -52,7 +52,7 @@ func (l *LWIP) loopIn() {
l.loopInWintun(winTun)
return
}
buffer := make([]byte, int(l.tunMtu) + PacketOffset)
buffer := make([]byte, int(l.tunMtu)+PacketOffset)
for {
n, err := l.tun.Read(buffer)
if err != nil {

2
system.go
View file

@ -134,7 +134,7 @@ func (s *System) tunLoop() {
s.wintunLoop(winTun)
return
}
packetBuffer := make([]byte, s.mtu + PacketOffset)
packetBuffer := make([]byte, s.mtu+PacketOffset)
for {
n, err := s.tun.Read(packetBuffer)
if err != nil {

2
tun_darwin_gvisor.go
View file

@ -51,7 +51,7 @@ func (e *DarwinEndpoint) Attach(dispatcher stack.NetworkDispatcher) {
}
func (e *DarwinEndpoint) dispatchLoop() {
packetBuffer := make([]byte, e.tun.mtu + 4)
packetBuffer := make([]byte, e.tun.mtu+4)
for {
n, err := e.tun.tunFile.Read(packetBuffer)
if err != nil {