add mtls dialer

pkg/listener/tls/listener.go

@@ -4,7 +4,6 @@ import (
 	"crypto/tls"
 	"net"
 
-	"github.com/go-gost/gost/pkg/common/util"
 	"github.com/go-gost/gost/pkg/listener"
 	"github.com/go-gost/gost/pkg/logger"
 	md "github.com/go-gost/gost/pkg/metadata"
@@ -17,9 +16,9 @@ func init() {
 
 type tlsListener struct {
 	addr string
-	md   metadata
 	net.Listener
 	logger logger.Logger
+	md     metadata
 }
 
 func NewListener(opts ...listener.Option) listener.Listener {
@@ -43,14 +42,7 @@ func (l *tlsListener) Init(md md.Metadata) (err error) {
 		return
 	}
 
-	ln = tls.NewListener(
-		&util.TCPKeepAliveListener{
-			TCPListener:     ln.(*net.TCPListener),
-			KeepAlivePeriod: l.md.keepAlivePeriod,
-		},
-		l.md.tlsConfig,
-	)
+	l.Listener = tls.NewListener(ln, l.md.tlsConfig)
 
-	l.Listener = ln
 	return
 }

pkg/listener/tls/metadata.go

@@ -2,23 +2,20 @@ package tls
 
 import (
 	"crypto/tls"
-	"time"
 
 	tls_util "github.com/go-gost/gost/pkg/common/util/tls"
 	md "github.com/go-gost/gost/pkg/metadata"
 )
 
 type metadata struct {
-	tlsConfig       *tls.Config
-	keepAlivePeriod time.Duration
+	tlsConfig *tls.Config
 }
 
 func (l *tlsListener) parseMetadata(md md.Metadata) (err error) {
 	const (
-		certFile        = "certFile"
-		keyFile         = "keyFile"
-		caFile          = "caFile"
-		keepAlivePeriod = "keepAlivePeriod"
+		certFile = "certFile"
+		keyFile  = "keyFile"
+		caFile   = "caFile"
 	)
 
 	l.md.tlsConfig, err = tls_util.LoadServerConfig(
@@ -30,6 +27,5 @@ func (l *tlsListener) parseMetadata(md md.Metadata) (err error) {
 		return
 	}
 
-	l.md.keepAlivePeriod = md.GetDuration(keepAlivePeriod)
 	return
 }

pkg/listener/tls/mux/listener.go

@@ -17,11 +17,11 @@ func init() {
 
 type mtlsListener struct {
 	addr string
-	md   metadata
 	net.Listener
-	connChan chan net.Conn
-	errChan  chan error
-	logger   logger.Logger
+	cqueue  chan net.Conn
+	errChan chan error
+	logger  logger.Logger
+	md      metadata
 }
 
 func NewListener(opts ...listener.Option) listener.Listener {
@@ -46,11 +46,7 @@ func (l *mtlsListener) Init(md md.Metadata) (err error) {
 	}
 	l.Listener = tls.NewListener(ln, l.md.tlsConfig)
 
-	queueSize := l.md.connQueueSize
-	if queueSize <= 0 {
-		queueSize = defaultQueueSize
-	}
-	l.connChan = make(chan net.Conn, queueSize)
+	l.cqueue = make(chan net.Conn, l.md.backlog)
 	l.errChan = make(chan error, 1)
 
 	go l.listenLoop()
@@ -73,8 +69,8 @@ func (l *mtlsListener) listenLoop() {
 func (l *mtlsListener) mux(conn net.Conn) {
 	smuxConfig := smux.DefaultConfig()
 	smuxConfig.KeepAliveDisabled = l.md.muxKeepAliveDisabled
-	if l.md.muxKeepAlivePeriod > 0 {
-		smuxConfig.KeepAliveInterval = l.md.muxKeepAlivePeriod
+	if l.md.muxKeepAliveInterval > 0 {
+		smuxConfig.KeepAliveInterval = l.md.muxKeepAliveInterval
 	}
 	if l.md.muxKeepAliveTimeout > 0 {
 		smuxConfig.KeepAliveTimeout = l.md.muxKeepAliveTimeout
@@ -103,12 +99,12 @@ func (l *mtlsListener) mux(conn net.Conn) {
 		}
 
 		select {
-		case l.connChan <- stream:
+		case l.cqueue <- stream:
 		case <-stream.GetDieCh():
 			stream.Close()
 		default:
 			stream.Close()
-			l.logger.Error("connection queue is full")
+			l.logger.Warnf("connection queue is full, client %s discarded", stream.RemoteAddr())
 		}
 	}
 }
@@ -116,7 +112,7 @@ func (l *mtlsListener) mux(conn net.Conn) {
 func (l *mtlsListener) Accept() (conn net.Conn, err error) {
 	var ok bool
 	select {
-	case conn = <-l.connChan:
+	case conn = <-l.cqueue:
 	case err, ok = <-l.errChan:
 		if !ok {
 			err = listener.ErrClosed

pkg/listener/tls/mux/metadata.go

@@ -9,20 +9,20 @@ import (
 )
 
 const (
-	defaultQueueSize = 128
+	defaultBacklog = 128
 )
 
 type metadata struct {
 	tlsConfig *tls.Config
 
 	muxKeepAliveDisabled bool
-	muxKeepAlivePeriod   time.Duration
+	muxKeepAliveInterval time.Duration
 	muxKeepAliveTimeout  time.Duration
 	muxMaxFrameSize      int
 	muxMaxReceiveBuffer  int
 	muxMaxStreamBuffer   int
 
-	connQueueSize int
+	backlog int
 }
 
 func (l *mtlsListener) parseMetadata(md md.Metadata) (err error) {
@@ -31,8 +31,10 @@ func (l *mtlsListener) parseMetadata(md md.Metadata) (err error) {
 		keyFile  = "keyFile"
 		caFile   = "caFile"
 
+		backlog = "backlog"
+
 		muxKeepAliveDisabled = "muxKeepAliveDisabled"
-		muxKeepAlivePeriod   = "muxKeepAlivePeriod"
+		muxKeepAliveInterval = "muxKeepAliveInterval"
 		muxKeepAliveTimeout  = "muxKeepAliveTimeout"
 		muxMaxFrameSize      = "muxMaxFrameSize"
 		muxMaxReceiveBuffer  = "muxMaxReceiveBuffer"
@@ -48,5 +50,17 @@ func (l *mtlsListener) parseMetadata(md md.Metadata) (err error) {
 		return
 	}
 
+	l.md.backlog = md.GetInt(backlog)
+	if l.md.backlog <= 0 {
+		l.md.backlog = defaultBacklog
+	}
+
+	l.md.muxKeepAliveDisabled = md.GetBool(muxKeepAliveDisabled)
+	l.md.muxKeepAliveInterval = md.GetDuration(muxKeepAliveInterval)
+	l.md.muxKeepAliveTimeout = md.GetDuration(muxKeepAliveTimeout)
+	l.md.muxMaxFrameSize = md.GetInt(muxMaxFrameSize)
+	l.md.muxMaxReceiveBuffer = md.GetInt(muxMaxReceiveBuffer)
+	l.md.muxMaxStreamBuffer = md.GetInt(muxMaxStreamBuffer)
+
 	return
 }