add router handler option

pkg/handler/dns/handler.go

@@ -21,13 +21,17 @@ import (
 	"github.com/miekg/dns"
 )
 
+const (
+	defaultNameserver = "udp://127.0.0.1:53"
+)
+
 func init() {
 	registry.RegisterHandler("dns", NewHandler)
 }
 
 type dnsHandler struct {
-	chain      *chain.Chain
 	bypass     bypass.Bypass
+	router     *chain.Router
 	exchangers []exchanger.Exchanger
 	cache      *resolver_util.Cache
 	logger     logger.Logger
@@ -44,6 +48,7 @@ func NewHandler(opts ...handler.Option) handler.Handler {
 
 	return &dnsHandler{
 		bypass: options.Bypass,
+		router: options.Router,
 		cache:  cache,
 		logger: options.Logger,
 	}
@@ -61,7 +66,7 @@ func (h *dnsHandler) Init(md md.Metadata) (err error) {
 		}
 		ex, err := exchanger.NewExchanger(
 			server,
-			exchanger.ChainOption(h.chain),
+			exchanger.RouterOption(h.router),
 			exchanger.TimeoutOption(h.md.timeout),
 			exchanger.LoggerOption(h.logger),
 		)
@@ -72,14 +77,13 @@ func (h *dnsHandler) Init(md md.Metadata) (err error) {
 		h.exchangers = append(h.exchangers, ex)
 	}
 	if len(h.exchangers) == 0 {
-		addr := "udp://127.0.0.1:53"
 		ex, err := exchanger.NewExchanger(
-			addr,
-			exchanger.ChainOption(h.chain),
+			defaultNameserver,
+			exchanger.RouterOption(h.router),
 			exchanger.TimeoutOption(h.md.timeout),
 			exchanger.LoggerOption(h.logger),
 		)
-		h.logger.Warnf("resolver not found, default to %s", addr)
+		h.logger.Warnf("resolver not found, default to %s", defaultNameserver)
 		if err != nil {
 			return err
 		}
@@ -88,11 +92,6 @@ func (h *dnsHandler) Init(md md.Metadata) (err error) {
 	return
 }
 
-// implements chain.Chainable interface
-func (h *dnsHandler) WithChain(chain *chain.Chain) {
-	h.chain = chain
-}
-
 func (h *dnsHandler) Handle(ctx context.Context, conn net.Conn) {
 	defer conn.Close()
 

pkg/handler/dns/metadata.go

@@ -10,7 +10,6 @@ import (
 
 type metadata struct {
 	readTimeout time.Duration
-	retryCount  int
 	ttl         time.Duration
 	timeout     time.Duration
 	clientIP    net.IP
@@ -22,7 +21,6 @@ type metadata struct {
 func (h *dnsHandler) parseMetadata(md mdata.Metadata) (err error) {
 	const (
 		readTimeout = "readTimeout"
-		retryCount  = "retry"
 		ttl         = "ttl"
 		timeout     = "timeout"
 		clientIP    = "clientIP"
@@ -31,7 +29,6 @@ func (h *dnsHandler) parseMetadata(md mdata.Metadata) (err error) {
 	)
 
 	h.md.readTimeout = mdata.GetDuration(md, readTimeout)
-	h.md.retryCount = mdata.GetInt(md, retryCount)
 	h.md.ttl = mdata.GetDuration(md, ttl)
 	h.md.timeout = mdata.GetDuration(md, timeout)
 	if h.md.timeout <= 0 {