go-gost/gost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix rudp

Browse Source
This commit is contained in:
ginuerzh 2022-01-28 11:57:26 +08:00
parent 397a13bcdb
commit b2b76a10a0
6 changed files with 54 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/common/util/udp/listener.go
View File

@ -18,6 +18,7 @@ type listener struct {
connPool *ConnPool
mux sync.Mutex
closed chan struct{}
errChan chan error
logger logger.Logger
}
@ -30,6 +31,7 @@ func NewListener(conn net.PacketConn, addr net.Addr, backlog, dataQueueSize, dat
readQueueSize: dataQueueSize,
readBufferSize: dataBufferSize,
closed: make(chan struct{}),
errChan: make(chan error, 1),
logger: logger,
}
go ln.listenLoop()
@ -43,6 +45,11 @@ func (ln *listener) Accept() (conn net.Conn, err error) {
return
case <-ln.closed:
return nil, net.ErrClosed
case err = <-ln.errChan:
if err == nil {
err = net.ErrClosed
}
return
}
}
@ -58,6 +65,8 @@ func (ln *listener) listenLoop() {
n, raddr, err := ln.conn.ReadFrom(*b)
if err != nil {
ln.errChan <- err
close(ln.errChan)
return
}

2
pkg/connector/socks/v5/bind.go
View File

@ -21,7 +21,7 @@ func (c *socks5Connector) Bind(ctx context.Context, conn net.Conn, network, addr
"network": network,
"address": address,
})
log.Infof("bind: %s/%s", address, network)
log.Infof("bind on %s/%s", address, network)
options := connector.BindOptions{}
for _, opt := range opts {

84
pkg/handler/relay/bind.go
View File

@ -6,7 +6,6 @@ import (
"net"
"time"
"github.com/go-gost/gost/pkg/common/bufpool"
"github.com/go-gost/gost/pkg/common/util/mux"
"github.com/go-gost/gost/pkg/common/util/socks"
"github.com/go-gost/gost/pkg/handler"
@ -113,13 +112,14 @@ func (h *relayHandler) bindUDP(ctx context.Context, conn net.Conn, network, addr
})
log.Debugf("bind on %s OK", pc.LocalAddr())
relay := handler.NewUDPRelay(socks.UDPTunServerConn(conn), pc).
WithBypass(h.options.Bypass).
WithLogger(log)
relay.SetBufferSize(h.md.udpBufferSize)
t := time.Now()
log.Infof("%s <-> %s", conn.RemoteAddr(), pc.LocalAddr())
h.tunnelServerUDP(
socks.UDPTunServerConn(conn),
pc,
log,
)
relay.Run()
log.WithFields(map[string]interface{}{
"duration": time.Since(t),
}).Infof("%s >-< %s", conn.RemoteAddr(), pc.LocalAddr())
@ -189,75 +189,3 @@ func (h *relayHandler) serveTCPBind(ctx context.Context, conn net.Conn, ln net.L
}(rc)
}
}
func (h *relayHandler) tunnelServerUDP(tunnel, c net.PacketConn, log logger.Logger) (err error) {
bufSize := h.md.udpBufferSize
errc := make(chan error, 2)
go func() {
for {
err := func() error {
b := bufpool.Get(bufSize)
defer bufpool.Put(b)
n, raddr, err := tunnel.ReadFrom(*b)
if err != nil {
return err
}
if h.options.Bypass != nil && h.options.Bypass.Contains(raddr.String()) {
log.Warn("bypass: ", raddr)
return nil
}
if _, err := c.WriteTo((*b)[:n], raddr); err != nil {
return err
}
log.Debugf("%s >>> %s data: %d",
c.LocalAddr(), raddr, n)
return nil
}()
if err != nil {
errc <- err
return
}
}
}()
go func() {
for {
err := func() error {
b := bufpool.Get(bufSize)
defer bufpool.Put(b)
n, raddr, err := c.ReadFrom(*b)
if err != nil {
return err
}
if h.options.Bypass != nil && h.options.Bypass.Contains(raddr.String()) {
log.Warn("bypass: ", raddr)
return nil
}
if _, err := tunnel.WriteTo((*b)[:n], raddr); err != nil {
return err
}
log.Debugf("%s <<< %s data: %d",
c.LocalAddr(), raddr, n)
return nil
}()
if err != nil {
errc <- err
return
}
}
}()
return <-errc
}

44
pkg/handler/socks/v5/udp_tun.go
View File

@ -16,6 +16,13 @@ func (h *socks5Handler) handleUDPTun(ctx context.Context, conn net.Conn, network
"cmd": "udp-tun",
})
bindAddr, _ := net.ResolveUDPAddr(network, address)
if bindAddr == nil {
bindAddr = &net.UDPAddr{}
}
if bindAddr.Port == 0 {
// relay mode
if !h.md.enableUDP {
reply := gosocks5.NewReply(gosocks5.NotAllowed, nil)
reply.Write(conn)
@ -23,28 +30,33 @@ func (h *socks5Handler) handleUDPTun(ctx context.Context, conn net.Conn, network
log.Error("UDP relay is diabled")
return
}
} else {
// BIND mode
if !h.md.enableBind {
reply := gosocks5.NewReply(gosocks5.NotAllowed, nil)
reply.Write(conn)
log.Debug(reply)
log.Error("BIND is diabled")
return
}
}
// dummy bind
reply := gosocks5.NewReply(gosocks5.Succeeded, nil)
pc, err := net.ListenUDP(network, bindAddr)
if err != nil {
log.Error(err)
return
}
defer pc.Close()
saddr := gosocks5.Addr{}
saddr.ParseFrom(pc.LocalAddr().String())
reply := gosocks5.NewReply(gosocks5.Succeeded, &saddr)
if err := reply.Write(conn); err != nil {
log.Error(err)
return
}
log.Debug(reply)
// obtain a udp connection
c, err := h.router.Dial(ctx, "udp", "") // UDP association
if err != nil {
log.Error(err)
return
}
defer c.Close()
pc, ok := c.(net.PacketConn)
if !ok {
log.Errorf("wrong connection type")
return
}
log.Debugf("bind on %s OK", pc.LocalAddr())
relay := handler.NewUDPRelay(socks.UDPTunServerConn(conn), pc).
WithBypass(h.options.Bypass).

4
pkg/handler/ss/udp/handler.go
View File

@ -109,10 +109,10 @@ func (h *ssuHandler) Handle(ctx context.Context, conn net.Conn) {
}
t := time.Now()
log.Infof("%s <-> %s", conn.RemoteAddr(), cc.LocalAddr())
log.Infof("%s <-> %s", conn.LocalAddr(), cc.LocalAddr())
h.relayPacket(pc, cc, log)
log.WithFields(map[string]interface{}{"duration": time.Since(t)}).
Infof("%s >-< %s", conn.RemoteAddr(), cc.LocalAddr())
Infof("%s >-< %s", conn.LocalAddr(), cc.LocalAddr())
}
func (h *ssuHandler) relayPacket(pc1, pc2 net.PacketConn, log logger.Logger) (err error) {

4
pkg/service/service.go
View File

@ -50,11 +50,11 @@ func (s *Service) serve() error {
if e != nil {
if ne, ok := e.(net.Error); ok && ne.Temporary() {
if tempDelay == 0 {
tempDelay = 100 * time.Millisecond
tempDelay = 1 * time.Second
} else {
tempDelay *= 2
}
if max := 1 * time.Second; tempDelay > max {
if max := 5 * time.Second; tempDelay > max {
tempDelay = max
}
s.logger.Warnf("accept: %v, retrying in %v", e, tempDelay)