fix udp bind

pkg/listener/udp/listener.go

@@ -3,7 +3,6 @@ package udp
 import (
 	"net"
 
-	"github.com/go-gost/gost/pkg/common/bufpool"
 	"github.com/go-gost/gost/pkg/common/util/udp"
 	"github.com/go-gost/gost/pkg/listener"
 	"github.com/go-gost/gost/pkg/logger"
@@ -16,14 +15,10 @@ func init() {
 }
 
 type udpListener struct {
-	addr     string
-	md       metadata
-	conn     net.PacketConn
-	cqueue   chan net.Conn
-	errChan  chan error
-	closed   chan struct{}
-	connPool *udp.ConnPool
-	logger   logger.Logger
+	addr string
+	md   metadata
+	net.Listener
+	logger logger.Logger
 }
 
 func NewListener(opts ...listener.Option) listener.Listener {
@@ -32,10 +27,8 @@ func NewListener(opts ...listener.Option) listener.Listener {
 		opt(options)
 	}
 	return &udpListener{
-		addr:    options.Addr,
-		errChan: make(chan error, 1),
-		closed:  make(chan struct{}),
-		logger:  options.Logger,
+		addr:   options.Addr,
+		logger: options.Logger,
 	}
 }
 
@@ -49,82 +42,15 @@ func (l *udpListener) Init(md md.Metadata) (err error) {
 		return
 	}
 
-	l.conn, err = net.ListenUDP("udp", laddr)
+	conn, err := net.ListenUDP("udp", laddr)
 	if err != nil {
 		return
 	}
 
-	l.cqueue = make(chan net.Conn, l.md.backlog)
-	l.connPool = udp.NewConnPool(l.md.ttl).WithLogger(l.logger)
-
-	go l.listenLoop()
-
+	l.Listener = udp.NewListener(conn, laddr,
+		l.md.backlog,
+		l.md.readQueueSize, l.md.readBufferSize,
+		l.md.ttl,
+		l.logger)
 	return
 }
-
-func (l *udpListener) Accept() (conn net.Conn, err error) {
-	var ok bool
-	select {
-	case conn = <-l.cqueue:
-	case err, ok = <-l.errChan:
-		if !ok {
-			err = listener.ErrClosed
-		}
-	}
-	return
-}
-
-func (l *udpListener) Close() error {
-	select {
-	case <-l.closed:
-	default:
-		close(l.closed)
-		l.connPool.Close()
-		return l.conn.Close()
-	}
-
-	return nil
-}
-
-func (l *udpListener) Addr() net.Addr {
-	return l.conn.LocalAddr()
-}
-
-func (l *udpListener) listenLoop() {
-	for {
-		b := bufpool.Get(l.md.readBufferSize)
-
-		n, raddr, err := l.conn.ReadFrom(b)
-		if err != nil {
-			l.errChan <- err
-			close(l.errChan)
-			return
-		}
-
-		c := l.getConn(raddr)
-		if c == nil {
-			bufpool.Put(b)
-			continue
-		}
-
-		if err := c.WriteQueue(b[:n]); err != nil {
-			l.logger.Warn("data discarded: ", err)
-		}
-	}
-}
-
-func (l *udpListener) getConn(addr net.Addr) *udp.Conn {
-	c, ok := l.connPool.Get(addr.String())
-	if !ok {
-		c = udp.NewConn(l.conn, l.conn.LocalAddr(), addr, l.md.readQueueSize)
-		select {
-		case l.cqueue <- c:
-			l.connPool.Set(addr.String(), c)
-		default:
-			c.Close()
-			l.logger.Warnf("connection queue is full, client %s discarded", addr.String())
-			return nil
-		}
-	}
-	return c
-}

pkg/listener/udp/metadata.go

@@ -7,8 +7,8 @@ import (
 )
 
 const (
-	defaultTTL            = 60 * time.Second
-	defaultReadBufferSize = 4096
+	defaultTTL            = 5 * time.Second
+	defaultReadBufferSize = 1024
 	defaultReadQueueSize  = 128
 	defaultBacklog        = 128
 )