separate ssu from ss

pkg/connector/ss/connector.go

@@ -2,14 +2,12 @@ package ss
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"net"
 	"time"
 
 	"github.com/go-gost/gosocks5"
 	"github.com/go-gost/gost/pkg/common/bufpool"
-	"github.com/go-gost/gost/pkg/common/util/socks"
 	"github.com/go-gost/gost/pkg/common/util/ss"
 	"github.com/go-gost/gost/pkg/connector"
 	"github.com/go-gost/gost/pkg/logger"
@@ -57,8 +55,6 @@ func (c *ssConnector) Connect(ctx context.Context, conn net.Conn, network, addre
 			c.logger.Error(err)
 			return nil, err
 		}
-	case "udp", "udp4", "udp6":
-		return c.connectUDP(ctx, conn, network, address)
 	default:
 		err := fmt.Errorf("network %s is unsupported", network)
 		c.logger.Error(err)
@@ -102,35 +98,3 @@ func (c *ssConnector) Connect(ctx context.Context, conn net.Conn, network, addre
 
 	return sc, nil
 }
-
-func (c *ssConnector) connectUDP(ctx context.Context, conn net.Conn, network, address string) (net.Conn, error) {
-	if !c.md.enableUDP {
-		err := errors.New("UDP relay is disabled")
-		c.logger.Error(err)
-		return nil, err
-	}
-
-	if c.md.connectTimeout > 0 {
-		conn.SetDeadline(time.Now().Add(c.md.connectTimeout))
-		defer conn.SetDeadline(time.Time{})
-	}
-
-	taddr, _ := net.ResolveUDPAddr(network, address)
-	if taddr == nil {
-		taddr = &net.UDPAddr{}
-	}
-
-	pc, ok := conn.(net.PacketConn)
-	if ok {
-		if c.md.cipher != nil {
-			pc = c.md.cipher.PacketConn(pc)
-		}
-
-		return ss.UDPClientConn(pc, conn.RemoteAddr(), taddr, c.md.udpBufferSize), nil
-	}
-
-	if c.md.cipher != nil {
-		conn = ss.ShadowConn(c.md.cipher.StreamConn(conn), nil)
-	}
-	return socks.UDPTunClientConn(conn, taddr), nil
-}

pkg/connector/ss/metadata.go

@@ -12,8 +12,6 @@ type metadata struct {
 	cipher         core.Cipher
 	connectTimeout time.Duration
 	noDelay        bool
-	enableUDP      bool
-	udpBufferSize  int
 }
 
 func (c *ssConnector) parseMetadata(md md.Metadata) (err error) {
@@ -23,8 +21,6 @@ func (c *ssConnector) parseMetadata(md md.Metadata) (err error) {
 		key            = "key"
 		connectTimeout = "timeout"
 		noDelay        = "nodelay"
-		enableUDP      = "udp"           // enable UDP relay
-		udpBufferSize  = "udpBufferSize" // udp buffer size
 	)
 
 	c.md.cipher, err = ss.ShadowCipher(
@@ -38,18 +34,6 @@ func (c *ssConnector) parseMetadata(md md.Metadata) (err error) {
 
 	c.md.connectTimeout = md.GetDuration(connectTimeout)
 	c.md.noDelay = md.GetBool(noDelay)
-	c.md.enableUDP = md.GetBool(enableUDP)
-
-	if c.md.udpBufferSize > 0 {
-		if c.md.udpBufferSize < 512 {
-			c.md.udpBufferSize = 512
-		}
-		if c.md.udpBufferSize > 65*1024 {
-			c.md.udpBufferSize = 65 * 1024
-		}
-	} else {
-		c.md.udpBufferSize = 4096
-	}
 
 	return
 }

pkg/connector/ss/udp/connector.go

@@ -0,0 +1,84 @@
+package ss
+
+import (
+	"context"
+	"fmt"
+	"net"
+	"time"
+
+	"github.com/go-gost/gost/pkg/common/util/socks"
+	"github.com/go-gost/gost/pkg/common/util/ss"
+	"github.com/go-gost/gost/pkg/connector"
+	"github.com/go-gost/gost/pkg/logger"
+	md "github.com/go-gost/gost/pkg/metadata"
+	"github.com/go-gost/gost/pkg/registry"
+)
+
+func init() {
+	registry.RegiserConnector("ssu", NewConnector)
+}
+
+type ssuConnector struct {
+	md     metadata
+	logger logger.Logger
+}
+
+func NewConnector(opts ...connector.Option) connector.Connector {
+	options := &connector.Options{}
+	for _, opt := range opts {
+		opt(options)
+	}
+
+	return &ssuConnector{
+		logger: options.Logger,
+	}
+}
+
+func (c *ssuConnector) Init(md md.Metadata) (err error) {
+	return c.parseMetadata(md)
+}
+
+func (c *ssuConnector) Connect(ctx context.Context, conn net.Conn, network, address string, opts ...connector.ConnectOption) (net.Conn, error) {
+	c.logger = c.logger.WithFields(map[string]interface{}{
+		"remote":  conn.RemoteAddr().String(),
+		"local":   conn.LocalAddr().String(),
+		"network": network,
+		"address": address,
+	})
+	c.logger.Infof("connect: %s/%s", address, network)
+
+	switch network {
+	case "udp", "udp4", "udp6":
+	default:
+		err := fmt.Errorf("network %s is unsupported", network)
+		c.logger.Error(err)
+		return nil, err
+	}
+
+	if c.md.connectTimeout > 0 {
+		conn.SetDeadline(time.Now().Add(c.md.connectTimeout))
+		defer conn.SetDeadline(time.Time{})
+	}
+
+	taddr, _ := net.ResolveUDPAddr(network, address)
+	if taddr == nil {
+		taddr = &net.UDPAddr{}
+	}
+
+	pc, ok := conn.(net.PacketConn)
+	if ok {
+		if c.md.cipher != nil {
+			pc = c.md.cipher.PacketConn(pc)
+		}
+
+		// standard UDP relay
+		return ss.UDPClientConn(pc, conn.RemoteAddr(), taddr, c.md.udpBufferSize), nil
+	}
+
+	if c.md.cipher != nil {
+		conn = ss.ShadowConn(c.md.cipher.StreamConn(conn), nil)
+	}
+
+	// UDP over TCP
+	return socks.UDPTunClientConn(conn, taddr), nil
+}

pkg/connector/ss/udp/metadata.go

@@ -0,0 +1,49 @@
+package ss
+
+import (
+	"time"
+
+	"github.com/go-gost/gost/pkg/common/util/ss"
+	md "github.com/go-gost/gost/pkg/metadata"
+	"github.com/shadowsocks/go-shadowsocks2/core"
+)
+
+type metadata struct {
+	cipher         core.Cipher
+	connectTimeout time.Duration
+	udpBufferSize  int
+}
+
+func (c *ssuConnector) parseMetadata(md md.Metadata) (err error) {
+	const (
+		method         = "method"
+		password       = "password"
+		key            = "key"
+		connectTimeout = "timeout"
+		udpBufferSize  = "udpBufferSize" // udp buffer size
+	)
+
+	c.md.cipher, err = ss.ShadowCipher(
+		md.GetString(method),
+		md.GetString(password),
+		md.GetString(key),
+	)
+	if err != nil {
+		return
+	}
+
+	c.md.connectTimeout = md.GetDuration(connectTimeout)
+
+	if c.md.udpBufferSize > 0 {
+		if c.md.udpBufferSize < 512 {
+			c.md.udpBufferSize = 512
+		}
+		if c.md.udpBufferSize > 65*1024 {
+			c.md.udpBufferSize = 65 * 1024
+		}
+	} else {
+		c.md.udpBufferSize = 4096
+	}
+
+	return
+}