proxy: nat fullcone support for tproxy, trojan, ss, socks5 (fix #253)

This commit is contained in:
nadoo committed 2022-03-11 19:08:07 +08:00
1 parent d68f361c35
commit a98995e2cb
42 files changed
+366 -280

No files matched your search

+2 -3
View File
@@ -105,8 +105,7 @@ func (s *Trojan) dial(network, addr string) (net.Conn, error) {
}
// DialUDP connects to the given address via the proxy.
func (s *Trojan) DialUDP(network, addr string) (net.PacketConn, net.Addr, error) {
func (s *Trojan) DialUDP(network, addr string) (net.PacketConn, error) {
c, err := s.dial("udp", addr)
// TODO: check the addr in return value
return NewPktConn(c, socks.ParseAddr(addr)), nil, err
return NewPktConn(c, socks.ParseAddr(addr)), err
}
+20 -13
View File
@@ -13,24 +13,23 @@ import (
// PktConn is a udp Packet.Conn.
type PktConn struct {
net.Conn
tgtAddr socks.Addr
target socks.Addr
}
// NewPktConn returns a PktConn.
func NewPktConn(c net.Conn, tgtAddr socks.Addr) *PktConn {
pc := &PktConn{
Conn: c,
tgtAddr: tgtAddr,
}
return pc
func NewPktConn(c net.Conn, target socks.Addr) *PktConn {
return &PktConn{Conn: c, target: target}
}
// ReadFrom implements the necessary function of net.PacketConn.
// NOTE: the underlying connection is not udp, we returned the target address here,
// it's not the server's address, do not WriteTo it.
func (pc *PktConn) ReadFrom(b []byte) (int, net.Addr, error) {
// ATYP, DST.ADDR, DST.PORT
_, err := socks.ReadAddr(pc.Conn)
tgtAddr, err := socks.ReadAddr(pc.Conn)
if err != nil {
return 0, nil, err
}
target, err := net.ResolveUDPAddr("udp", tgtAddr.String())
if err != nil {
return 0, nil, err
}
@@ -62,16 +61,24 @@ func (pc *PktConn) ReadFrom(b []byte) (int, net.Addr, error) {
return n, nil, err
}
// TODO: check the addr in return value, it's a fake packetConn so the addr is not valid
return n, pc.tgtAddr, err
return n, target, err
}
// WriteTo implements the necessary function of net.PacketConn.
func (pc *PktConn) WriteTo(b []byte, addr net.Addr) (int, error) {
target := pc.target
if addr != nil {
target = socks.ParseAddr(addr.String())
}
if target == nil {
return 0, errors.New("invalid addr")
}
buf := pool.GetBytesBuffer()
defer pool.PutBytesBuffer(buf)
tgtLen, _ := buf.Write(pc.tgtAddr)
tgtLen, _ := buf.Write(target)
binary.Write(buf, binary.BigEndian, uint16(len(b)))
buf.WriteString("\r\n")
buf.Write(b)
+5 -11
View File
@@ -194,22 +194,16 @@ func (s *Trojan) readHeader(r io.Reader) (byte, socks.Addr, error) {
// ServeUoT serves udp over tcp requests.
func (s *Trojan) ServeUoT(c net.Conn, tgt socks.Addr) {
rc, err := net.ListenPacket("udp", "")
lc, err := net.ListenPacket("udp", "")
if err != nil {
log.F("[trojan] UDP listen error: %v", err)
return
}
defer rc.Close()
tgtAddr, err := net.ResolveUDPAddr("udp", tgt.String())
if err != nil {
log.F("[vless] error in ResolveUDPAddr: %v", err)
return
}
defer lc.Close()
pc := NewPktConn(c, tgt)
log.F("[trojan] %s <-tcp-> %s - %s <-udp-> %s", c.RemoteAddr(), c.LocalAddr(), rc.LocalAddr(), tgt)
log.F("[trojan] %s <-UoT-> %s <-> %s", c.RemoteAddr(), lc.LocalAddr(), tgt)
go proxy.CopyUDP(rc, tgtAddr, pc, 2*time.Minute, 5*time.Second)
proxy.CopyUDP(pc, nil, rc, 2*time.Minute, 5*time.Second)
go proxy.CopyUDP(lc, nil, pc, 2*time.Minute, 5*time.Second)
proxy.CopyUDP(pc, nil, lc, 2*time.Minute, 5*time.Second)
}