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

Revert "Update udpant usages"

Browse source
This commit is contained in:
世界 2024-11-27 18:04:39 +08:00
parent 59a6bdc1fa
commit 091b5da950
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
5 changed files with 8 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
go.mod
View file

@ -9,7 +9,7 @@ require (
github.com/sagernet/gvisor v0.0.0-20241123041152-536d05261cff github.com/sagernet/gvisor v0.0.0-20241123041152-536d05261cff
github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a
github.com/sagernet/nftables v0.3.0-beta.4 github.com/sagernet/nftables v0.3.0-beta.4
github.com/sagernet/sing v0.6.0-alpha.24 github.com/sagernet/sing v0.6.0-alpha.25
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba go4.org/netipx v0.0.0-20231129151722-fdeea329fbba
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8
golang.org/x/net v0.26.0 golang.org/x/net v0.26.0

4
go.sum
View file

@ -22,8 +22,8 @@ github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a h1:ObwtHN2VpqE0ZN
github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a/go.mod h1:xLnfdiJbSp8rNqYEdIW/6eDO4mVoogml14Bh2hSiFpM= github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a/go.mod h1:xLnfdiJbSp8rNqYEdIW/6eDO4mVoogml14Bh2hSiFpM=
github.com/sagernet/nftables v0.3.0-beta.4 h1:kbULlAwAC3jvdGAC1P5Fa3GSxVwQJibNenDW2zaXr8I= github.com/sagernet/nftables v0.3.0-beta.4 h1:kbULlAwAC3jvdGAC1P5Fa3GSxVwQJibNenDW2zaXr8I=
github.com/sagernet/nftables v0.3.0-beta.4/go.mod h1:OQXAjvjNGGFxaTgVCSTRIhYB5/llyVDeapVoENYBDS8= github.com/sagernet/nftables v0.3.0-beta.4/go.mod h1:OQXAjvjNGGFxaTgVCSTRIhYB5/llyVDeapVoENYBDS8=
github.com/sagernet/sing v0.6.0-alpha.24 h1:qPc9i0mHADIFNYlWMg7fWWZZ0kBxWHEs8npsAG6KqAo= github.com/sagernet/sing v0.6.0-alpha.25 h1:r/UxU+1O6436MjvEXEMRfBBtqMEImgA6uqxezXKZ/Rs=
github.com/sagernet/sing v0.6.0-alpha.24/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak= github.com/sagernet/sing v0.6.0-alpha.25/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/vishvananda/netns v0.0.4 h1:Oeaw1EM2JMxD51g9uhtC0D7erkIjgmj8+JZc26m1YX8= github.com/vishvananda/netns v0.0.4 h1:Oeaw1EM2JMxD51g9uhtC0D7erkIjgmj8+JZc26m1YX8=
github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM= github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=

6
stack_gvisor.go
View file

@ -34,7 +34,6 @@ type GVisor struct {
logger logger.Logger logger logger.Logger
stack *stack.Stack stack *stack.Stack
endpoint stack.LinkEndpoint endpoint stack.LinkEndpoint
udpForwarder *UDPForwarder
} }
type GVisorTun interface { type GVisorTun interface {
@ -72,11 +71,9 @@ func (t *GVisor) Start() error {
return err return err
} }
ipStack.SetTransportProtocolHandler(tcp.ProtocolNumber, NewTCPForwarder(t.ctx, ipStack, t.handler).HandlePacket) ipStack.SetTransportProtocolHandler(tcp.ProtocolNumber, NewTCPForwarder(t.ctx, ipStack, t.handler).HandlePacket)
udpForwarder := NewUDPForwarder(t.ctx, ipStack, t.handler, t.udpTimeout) ipStack.SetTransportProtocolHandler(udp.ProtocolNumber, NewUDPForwarder(t.ctx, ipStack, t.handler, t.udpTimeout).HandlePacket)
ipStack.SetTransportProtocolHandler(udp.ProtocolNumber, udpForwarder.HandlePacket)
t.stack = ipStack t.stack = ipStack
t.endpoint = linkEndpoint t.endpoint = linkEndpoint
t.udpForwarder = udpForwarder
return nil return nil
} }
@ -89,7 +86,6 @@ func (t *GVisor) Close() error {
for _, endpoint := range t.stack.CleanupEndpoints() { for _, endpoint := range t.stack.CleanupEndpoints() {
endpoint.Abort() endpoint.Abort()
} }
t.udpForwarder.Close()
return nil return nil
} }

8
stack_gvisor_udp.go
View file

@ -37,16 +37,10 @@ func NewUDPForwarder(ctx context.Context, stack *stack.Stack, handler Handler, t
stack: stack, stack: stack,
handler: handler, handler: handler,
} }
udpNat := udpnat.New(handler, forwarder.PreparePacketConnection, timeout, true) forwarder.udpNat = udpnat.New(handler, forwarder.PreparePacketConnection, timeout, true)
udpNat.Start()
forwarder.udpNat = udpNat
return forwarder return forwarder
} }
func (f *UDPForwarder) Close() {
f.udpNat.Close()
}
func (f *UDPForwarder) HandlePacket(id stack.TransportEndpointID, pkt *stack.PacketBuffer) bool { func (f *UDPForwarder) HandlePacket(id stack.TransportEndpointID, pkt *stack.PacketBuffer) bool {
source := M.SocksaddrFrom(AddrFromAddress(id.RemoteAddress), id.RemotePort) source := M.SocksaddrFrom(AddrFromAddress(id.RemoteAddress), id.RemotePort)
destination := M.SocksaddrFrom(AddrFromAddress(id.LocalAddress), id.LocalPort) destination := M.SocksaddrFrom(AddrFromAddress(id.LocalAddress), id.LocalPort)

10
stack_mixed.go
View file

@ -16,9 +16,8 @@ import (
type Mixed struct { type Mixed struct {
*System *System
stack *stack.Stack stack *stack.Stack
endpoint *channel.Endpoint endpoint *channel.Endpoint
udpForwarder *UDPForwarder
} }
func NewMixed( func NewMixed(
@ -43,11 +42,9 @@ func (m *Mixed) Start() error {
if err != nil { if err != nil {
return err return err
} }
udpForwarder := NewUDPForwarder(m.ctx, ipStack, m.handler, m.udpTimeout) ipStack.SetTransportProtocolHandler(udp.ProtocolNumber, NewUDPForwarder(m.ctx, ipStack, m.handler, m.udpTimeout).HandlePacket)
ipStack.SetTransportProtocolHandler(udp.ProtocolNumber, udpForwarder.HandlePacket)
m.stack = ipStack m.stack = ipStack
m.endpoint = endpoint m.endpoint = endpoint
m.udpForwarder = udpForwarder
go m.tunLoop() go m.tunLoop()
go m.packetLoop() go m.packetLoop()
return nil return nil
@ -62,7 +59,6 @@ func (m *Mixed) Close() error {
for _, endpoint := range m.stack.CleanupEndpoints() { for _, endpoint := range m.stack.CleanupEndpoints() {
endpoint.Abort() endpoint.Abort()
} }
m.udpNat.Close()
return m.System.Close() return m.System.Close()
} }