add resolver for router

pkg/handler/tap/handler.go

@@ -20,7 +20,6 @@ import (
 	"github.com/go-gost/gost/pkg/registry"
 	"github.com/shadowsocks/go-shadowsocks2/shadowaead"
 	"github.com/songgao/water/waterutil"
-	"github.com/xtaci/tcpraw"
 )
 
 func init() {
@@ -29,10 +28,10 @@ func init() {
 
 type tapHandler struct {
 	group  *chain.NodeGroup
-	chain  *chain.Chain
 	bypass bypass.Bypass
 	routes sync.Map
 	exit   chan struct{}
+	router *chain.Router
 	logger logger.Logger
 	md     metadata
 }
@@ -45,18 +44,27 @@ func NewHandler(opts ...handler.Option) handler.Handler {
 
 	return &tapHandler{
 		bypass: options.Bypass,
-		exit:   make(chan struct{}, 1),
+		router: (&chain.Router{}).
+			WithLogger(options.Logger).
+			WithResolver(options.Resolver),
 		logger: options.Logger,
+		exit:   make(chan struct{}, 1),
 	}
 }
 
 func (h *tapHandler) Init(md md.Metadata) (err error) {
-	return h.parseMetadata(md)
+	if err := h.parseMetadata(md); err != nil {
+		return err
+	}
+
+	h.router.WithRetry(h.md.retryCount)
+
+	return nil
 }
 
 // implements chain.Chainable interface
 func (h *tapHandler) WithChain(chain *chain.Chain) {
-	h.chain = chain
+	h.router.WithChain(chain)
 }
 
 // Forward implements handler.Forwarder.
@@ -113,13 +121,9 @@ func (h *tapHandler) handleLoop(ctx context.Context, conn net.Conn, addr net.Add
 		err := func() error {
 			var err error
 			var pc net.PacketConn
-			// fake tcp mode will be ignored when the client specifies a chain.
-			if addr != nil && !h.chain.IsEmpty() {
-				r := (&chain.Router{}).
-					WithChain(h.chain).
-					WithRetry(h.md.retryCount).
-					WithLogger(h.logger)
-				cc, err := r.Dial(ctx, addr.Network(), addr.String())
+
+			if addr != nil {
+				cc, err := h.router.Dial(ctx, addr.Network(), addr.String())
 				if err != nil {
 					return err
 				}
@@ -130,16 +134,8 @@ func (h *tapHandler) handleLoop(ctx context.Context, conn net.Conn, addr net.Add
 					return errors.New("invalid connection")
 				}
 			} else {
-				if h.md.tcpMode {
-					if addr != nil {
-						pc, err = tcpraw.Dial("tcp", addr.String())
-					} else {
-						pc, err = tcpraw.Listen("tcp", conn.LocalAddr().String())
-					}
-				} else {
-					laddr, _ := net.ResolveUDPAddr("udp", conn.LocalAddr().String())
-					pc, err = net.ListenUDP("udp", laddr)
-				}
+				laddr, _ := net.ResolveUDPAddr("udp", conn.LocalAddr().String())
+				pc, err = net.ListenUDP("udp", laddr)
 			}
 			if err != nil {
 				return err

pkg/handler/tap/metadata.go

@@ -11,7 +11,6 @@ import (
 type metadata struct {
 	cipher     core.Cipher
 	retryCount int
-	tcpMode    bool
 	bufferSize int
 }
 
@@ -21,7 +20,6 @@ func (h *tapHandler) parseMetadata(md mdata.Metadata) (err error) {
 		key         = "key"
 		readTimeout = "readTimeout"
 		retryCount  = "retry"
-		tcpMode     = "tcp"
 		bufferSize  = "bufferSize"
 	)
 
@@ -40,7 +38,6 @@ func (h *tapHandler) parseMetadata(md mdata.Metadata) (err error) {
 		return
 	}
 	h.md.retryCount = mdata.GetInt(md, retryCount)
-	h.md.tcpMode = mdata.GetBool(md, tcpMode)
 
 	h.md.bufferSize = mdata.GetInt(md, bufferSize)
 	if h.md.bufferSize <= 0 {