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

Implementation read waiter for socks5 UDP and UoT

Browse source
This commit is contained in:
世界 2023-12-06 20:16:37 +08:00
parent ae8098ad39
commit aa34723225
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
4 changed files with 97 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
protocol/socks/client.go
View file

@ -7,6 +7,7 @@ import (
"os"
"strings"
"github.com/sagernet/sing/common/bufio"
E "github.com/sagernet/sing/common/exceptions"
M "github.com/sagernet/sing/common/metadata"
N "github.com/sagernet/sing/common/network"
@ -147,7 +148,7 @@ func (c *Client) DialContext(ctx context.Context, network string, address M.Sock
tcpConn.Close()
return nil, err
}
return NewAssociateConn(udpConn, address, tcpConn), nil
return NewAssociatePacketConn(bufio.NewUnbindPacketConn(udpConn), address, tcpConn), nil
}
return nil, os.ErrInvalid
}

10
protocol/socks/packet.go
View file

@ -7,6 +7,7 @@ import (
"github.com/sagernet/sing/common"
"github.com/sagernet/sing/common/buf"
"github.com/sagernet/sing/common/bufio"
E "github.com/sagernet/sing/common/exceptions"
M "github.com/sagernet/sing/common/metadata"
N "github.com/sagernet/sing/common/network"
)
@ -17,6 +18,8 @@ import (
// | 2 | 1 | 1 | Variable | 2 | Variable |
// +----+------+------+----------+----------+----------+
var ErrInvalidPacket = E.New("socks5: invalid packet")
type AssociatePacketConn struct {
N.NetPacketConn
remoteAddr M.Socksaddr
@ -31,6 +34,7 @@ func NewAssociatePacketConn(conn net.PacketConn, remoteAddr M.Socksaddr, underly
}
}
// Deprecated: NewAssociatePacketConn(bufio.NewUnbindPacketConn(conn), remoteAddr, underlying) instead.
func NewAssociateConn(conn net.Conn, remoteAddr M.Socksaddr, underlying net.Conn) *AssociatePacketConn {
return &AssociatePacketConn{
NetPacketConn: bufio.NewUnbindPacketConn(conn),
@ -49,6 +53,9 @@ func (c *AssociatePacketConn) ReadFrom(p []byte) (n int, addr net.Addr, err erro
if err != nil {
return
}
if n < 3 {
return 0, nil, ErrInvalidPacket
}
c.remoteAddr = M.SocksaddrFromNet(addr)
reader := bytes.NewReader(p[3:n])
destination, err := M.SocksaddrSerializer.ReadAddrPort(reader)
@ -92,6 +99,9 @@ func (c *AssociatePacketConn) ReadPacket(buffer *buf.Buffer) (destination M.Sock
if err != nil {
return M.Socksaddr{}, err
}
if buffer.Len() < 3 {
return M.Socksaddr{}, ErrInvalidPacket
}
c.remoteAddr = destination
buffer.Advance(3)
destination, err = M.SocksaddrSerializer.ReadAddrPort(buffer)

48
protocol/socks/packet_wait.go Normal file
View file

@ -0,0 +1,48 @@
package socks
import (
"github.com/sagernet/sing/common/buf"
"github.com/sagernet/sing/common/bufio"
M "github.com/sagernet/sing/common/metadata"
N "github.com/sagernet/sing/common/network"
)
var _ N.PacketReadWaitCreator = (*AssociatePacketConn)(nil)
func (c *AssociatePacketConn) CreateReadWaiter() (N.PacketReadWaiter, bool) {
readWaiter, isReadWaiter := bufio.CreatePacketReadWaiter(c.NetPacketConn)
if !isReadWaiter {
return nil, false
}
return &AssociatePacketReadWaiter{c, readWaiter}, true
}
var _ N.PacketReadWaiter = (*AssociatePacketReadWaiter)(nil)
type AssociatePacketReadWaiter struct {
conn *AssociatePacketConn
readWaiter N.PacketReadWaiter
}
func (w *AssociatePacketReadWaiter) InitializeReadWaiter(newBuffer func() *buf.Buffer) {
w.readWaiter.InitializeReadWaiter(newBuffer)
}
func (w *AssociatePacketReadWaiter) WaitReadPacket() (buffer *buf.Buffer, destination M.Socksaddr, err error) {
buffer, destination, err = w.readWaiter.WaitReadPacket()
if err != nil {
return
}
if buffer.Len() < 3 {
buffer.Release()
return nil, M.Socksaddr{}, ErrInvalidPacket
}
w.conn.remoteAddr = destination
buffer.Advance(3)
destination, err = M.SocksaddrSerializer.ReadAddrPort(buffer)
if err != nil {
buffer.Release()
return nil, M.Socksaddr{}, err
}
return
}