udp: remove uottun and optimize udp implementation

This commit is contained in:
nadoo committed 2020-10-15 00:19:05 +08:00
1 parent 78e03d7fbf
commit d510ea45b0
19 files changed
+83 -249

No files matched your search

-4
View File
@@ -29,10 +29,6 @@ func (s *SS) Dial(network, addr string) (net.Conn, error) {
return nil, errors.New("[ss] unable to parse address: " + addr)
}
if network == "uot" {
target[0] = target[0] | 0x8
}
c, err := s.dialer.Dial("tcp", s.addr)
if err != nil {
log.F("[ss] dial to %s error: %s", s.addr, err)
+10 -5
View File
@@ -67,11 +67,16 @@ func (pc *PktConn) WriteTo(b []byte, addr net.Addr) (int, error) {
return pc.PacketConn.WriteTo(b, addr)
}
buf := pool.GetBuffer(len(pc.tgtAddr) + len(b))
pool.PutBuffer(buf)
buf := pool.GetWriteBuffer()
defer pool.PutWriteBuffer(buf)
copy(buf, pc.tgtAddr)
copy(buf[len(pc.tgtAddr):], b)
tgtLen, _ := buf.Write(pc.tgtAddr)
buf.Write(b)
return pc.PacketConn.WriteTo(buf, pc.writeAddr)
n, err := pc.PacketConn.WriteTo(buf.Bytes(), pc.writeAddr)
if n > tgtLen {
return n - tgtLen, err
}
return 0, err
}
+2 -40
View File
@@ -7,7 +7,6 @@ import (
"time"
"github.com/nadoo/glider/log"
"github.com/nadoo/glider/pool"
"github.com/nadoo/glider/proxy"
"github.com/nadoo/glider/proxy/socks"
)
@@ -60,45 +59,8 @@ func (s *SS) Serve(c net.Conn) {
return
}
dialer := s.proxy.NextDialer(tgt.String())
// udp over tcp?
uot := socks.UoT(tgt[0])
if uot && dialer.Addr() == "DIRECT" {
rc, err := net.ListenPacket("udp", "")
if err != nil {
log.F("[ss] UDP remote listen error: %v", err)
}
defer rc.Close()
buf := pool.GetBuffer(proxy.UDPBufSize)
defer pool.PutBuffer(buf)
n, err := c.Read(buf)
if err != nil {
log.F("[ss] error in read: %s\n", err)
return
}
tgtAddr, _ := net.ResolveUDPAddr("udp", tgt.String())
rc.WriteTo(buf[:n], tgtAddr)
n, _, err = rc.ReadFrom(buf)
if err != nil {
log.F("[ss] read error: %v", err)
}
c.Write(buf[:n])
log.F("[ss] %s <-tcp-> %s - %s <-udp-> %s ", c.RemoteAddr(), c.LocalAddr(), rc.LocalAddr(), tgt)
return
}
network := "tcp"
if uot {
network = "udp"
}
dialer := s.proxy.NextDialer(tgt.String())
rc, err := dialer.Dial(network, tgt.String())
if err != nil {
@@ -161,7 +123,7 @@ func (s *SS) ListenAndServeUDP() {
nm.Delete(raddr.String())
}()
log.F("[ssu] %s <-> %s", raddr, c.tgtAddr)
log.F("[ssu] %s <-> %s via %s", raddr, c.tgtAddr, nextHop)
} else {
pc = v.(*PktConn)