trojan,vless: use proxy.RelayUDP to support ReadDeadline

This commit is contained in:
nadoo committed 2021-07-26 23:14:35 +08:00
1 parent f66303b38d
commit a08c939dac
3 files changed
+26 -77

No files matched your search

+3 -32
View File
@@ -8,6 +8,7 @@ import (
"io"
"net"
"strings"
"time"
"github.com/nadoo/glider/log"
"github.com/nadoo/glider/pool"
@@ -203,38 +204,8 @@ func (s *Trojan) ServeUoT(c net.Conn, tgt socks.Addr) {
}
pc := NewPktConn(c, tgt)
go func() {
buf := pool.GetBuffer(proxy.UDPBufSize)
defer pool.PutBuffer(buf)
for {
n, _, err := pc.ReadFrom(buf)
if err != nil {
return
}
_, err = rc.WriteTo(buf[:n], tgtAddr)
if err != nil {
return
}
}
}()
log.F("[trojan] %s <-tcp-> %s - %s <-udp-> %s", c.RemoteAddr(), c.LocalAddr(), rc.LocalAddr(), tgt)
buf := pool.GetBuffer(proxy.UDPBufSize)
defer pool.PutBuffer(buf)
for {
n, _, err := rc.ReadFrom(buf)
if err != nil {
break
}
// WriteTo addr can be nil because the PktConn has it's own target, see packet.go
_, err = pc.WriteTo(buf[:n], nil)
if err != nil {
break
}
}
go proxy.RelayUDP(rc, tgtAddr, pc, 2*time.Minute)
proxy.RelayUDP(pc, nil, rc, 2*time.Minute)
}