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

Improve udpnat write back

Browse source
This commit is contained in:
世界 2022-06-01 15:52:42 +08:00
parent ee9be8af94
commit e4d76a44eb
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
7 changed files with 40 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

22
none.go
View file

@ -162,14 +162,14 @@ func (c *nonePacketConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
type NoneService struct {
handler Handler
udp *udpnat.Service[netip.AddrPort]
udpNat *udpnat.Service[netip.AddrPort]
}
func NewNoneService(udpTimeout int64, handler Handler) Service {
s := &NoneService{
handler: handler,
}
s.udp = udpnat.New[netip.AddrPort](udpTimeout, s)
s.udpNat = udpnat.New[netip.AddrPort](udpTimeout, handler)
return s
}
@ -193,29 +193,29 @@ func (s *NoneService) NewPacket(ctx context.Context, conn N.PacketConn, buffer *
}
metadata.Protocol = "shadowsocks"
metadata.Destination = destination
s.udp.NewPacket(ctx, metadata.Source.AddrPort(), func() N.PacketWriter {
return &nonePacketWriter{conn, metadata.Source}
}, buffer, metadata)
s.udpNat.NewPacket(ctx, metadata.Source.AddrPort(), buffer, metadata, func(natConn N.PacketConn) N.PacketWriter {
return &nonePacketWriter{conn, natConn}
})
return nil
}
type nonePacketWriter struct {
N.PacketConn
sourceAddr M.Socksaddr
source N.PacketConn
nat N.PacketConn
}
func (s *nonePacketWriter) WritePacket(buffer *buf.Buffer, destination M.Socksaddr) error {
func (w *nonePacketWriter) WritePacket(buffer *buf.Buffer, destination M.Socksaddr) error {
header := buf.With(buffer.ExtendHeader(M.SocksaddrSerializer.AddrPortLen(destination)))
err := M.SocksaddrSerializer.WriteAddrPort(header, destination)
if err != nil {
buffer.Release()
return err
}
return s.PacketConn.WritePacket(buffer, s.sourceAddr)
return w.source.WritePacket(buffer, M.SocksaddrFromNet(w.nat.LocalAddr()))
}
func (s *NoneService) NewPacketConnection(ctx context.Context, conn N.PacketConn, metadata M.Metadata) error {
return s.handler.NewPacketConnection(ctx, conn, metadata)
func (w *nonePacketWriter) Upstream() any {
return w.source
}
func (s *NoneService) HandleError(err error) {