add port range support for service

handler/socks/v4/handler.go

@@ -6,7 +6,6 @@ import (
 	"net"
 	"time"
 
-	"github.com/go-gost/core/chain"
 	"github.com/go-gost/core/handler"
 	"github.com/go-gost/core/limiter/traffic"
 	"github.com/go-gost/core/logger"
@@ -32,7 +31,6 @@ func init() {
 }
 
 type socks4Handler struct {
-	router  *chain.Router
 	md      metadata
 	options handler.Options
 	stats   *stats_util.HandlerStats
@@ -56,11 +54,6 @@ func (h *socks4Handler) Init(md md.Metadata) (err error) {
 		return err
 	}
 
-	h.router = h.options.Router
-	if h.router == nil {
-		h.router = chain.NewRouter(chain.LoggerRouterOption(h.options.Logger))
-	}
-
 	ctx, cancel := context.WithCancel(context.Background())
 	h.cancel = cancel
 
@@ -154,7 +147,7 @@ func (h *socks4Handler) handleConnect(ctx context.Context, conn net.Conn, req *g
 		ctx = ctxvalue.ContextWithHash(ctx, &ctxvalue.Hash{Source: addr})
 	}
 
-	cc, err := h.router.Dial(ctx, "tcp", addr)
+	cc, err := h.options.Router.Dial(ctx, "tcp", addr)
 	if err != nil {
 		resp := gosocks4.NewReply(gosocks4.Failed, nil)
 		log.Trace(resp)

handler/socks/v5/connect.go

@@ -35,7 +35,7 @@ func (h *socks5Handler) handleConnect(ctx context.Context, conn net.Conn, networ
 		ctx = ctxvalue.ContextWithHash(ctx, &ctxvalue.Hash{Source: address})
 	}
 
-	cc, err := h.router.Dial(ctx, network, address)
+	cc, err := h.options.Router.Dial(ctx, network, address)
 	if err != nil {
 		resp := gosocks5.NewReply(gosocks5.NetUnreachable, nil)
 		log.Trace(resp)

handler/socks/v5/handler.go

@@ -6,7 +6,6 @@ import (
 	"net"
 	"time"
 
-	"github.com/go-gost/core/chain"
 	"github.com/go-gost/core/handler"
 	md "github.com/go-gost/core/metadata"
 	"github.com/go-gost/gosocks5"
@@ -27,7 +26,6 @@ func init() {
 
 type socks5Handler struct {
 	selector gosocks5.Selector
-	router   *chain.Router
 	md       metadata
 	options  handler.Options
 	stats    *stats_util.HandlerStats
@@ -51,11 +49,6 @@ func (h *socks5Handler) Init(md md.Metadata) (err error) {
 		return
 	}
 
-	h.router = h.options.Router
-	if h.router == nil {
-		h.router = chain.NewRouter(chain.LoggerRouterOption(h.options.Logger))
-	}
-
 	h.selector = &serverSelector{
 		Authenticator: h.options.Auther,
 		TLSConfig:     h.options.TLSConfig,

handler/socks/v5/udp.go

@@ -59,7 +59,7 @@ func (h *socks5Handler) handleUDP(ctx context.Context, conn net.Conn, log logger
 	log.Debugf("bind on %s OK", cc.LocalAddr())
 
 	// obtain a udp connection
-	c, err := h.router.Dial(ctx, "udp", "") // UDP association
+	c, err := h.options.Router.Dial(ctx, "udp", "") // UDP association
 	if err != nil {
 		log.Error(err)
 		return err

handler/socks/v5/udp_tun.go

@@ -37,7 +37,7 @@ func (h *socks5Handler) handleUDPTun(ctx context.Context, conn net.Conn, network
 		}
 
 		// obtain a udp connection
-		c, err := h.router.Dial(ctx, "udp", "") // UDP association
+		c, err := h.options.Router.Dial(ctx, "udp", "") // UDP association
 		if err != nil {
 			log.Error(err)
 			return err