add router handler option
This commit is contained in:
@ -34,9 +34,7 @@ func NewHandler(opts ...handler.Option) handler.Handler {
|
||||
|
||||
return &socks4Handler{
|
||||
bypass: options.Bypass,
|
||||
router: (&chain.Router{}).
|
||||
WithLogger(options.Logger).
|
||||
WithResolver(options.Resolver),
|
||||
router: options.Router,
|
||||
logger: options.Logger,
|
||||
}
|
||||
}
|
||||
@ -46,16 +44,9 @@ func (h *socks4Handler) Init(md md.Metadata) (err error) {
|
||||
return err
|
||||
}
|
||||
|
||||
h.router.WithRetry(h.md.retryCount)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// implements chain.Chainable interface
|
||||
func (h *socks4Handler) WithChain(chain *chain.Chain) {
|
||||
h.router.WithChain(chain)
|
||||
}
|
||||
|
||||
func (h *socks4Handler) Handle(ctx context.Context, conn net.Conn) {
|
||||
defer conn.Close()
|
||||
|
||||
|
@ -10,14 +10,12 @@ import (
|
||||
type metadata struct {
|
||||
authenticator auth.Authenticator
|
||||
readTimeout time.Duration
|
||||
retryCount int
|
||||
}
|
||||
|
||||
func (h *socks4Handler) parseMetadata(md mdata.Metadata) (err error) {
|
||||
const (
|
||||
users = "users"
|
||||
readTimeout = "readTimeout"
|
||||
retryCount = "retry"
|
||||
)
|
||||
|
||||
if auths := mdata.GetStrings(md, users); len(auths) > 0 {
|
||||
@ -31,6 +29,5 @@ func (h *socks4Handler) parseMetadata(md mdata.Metadata) (err error) {
|
||||
}
|
||||
|
||||
h.md.readTimeout = mdata.GetDuration(md, readTimeout)
|
||||
h.md.retryCount = mdata.GetInt(md, retryCount)
|
||||
return
|
||||
}
|
||||
|
@ -36,9 +36,7 @@ func NewHandler(opts ...handler.Option) handler.Handler {
|
||||
|
||||
return &socks5Handler{
|
||||
bypass: options.Bypass,
|
||||
router: (&chain.Router{}).
|
||||
WithLogger(options.Logger).
|
||||
WithResolver(options.Resolver),
|
||||
router: options.Router,
|
||||
logger: options.Logger,
|
||||
}
|
||||
}
|
||||
@ -55,16 +53,9 @@ func (h *socks5Handler) Init(md md.Metadata) (err error) {
|
||||
noTLS: h.md.noTLS,
|
||||
}
|
||||
|
||||
h.router.WithRetry(h.md.retryCount)
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
// implements chain.Chainable interface
|
||||
func (h *socks5Handler) WithChain(chain *chain.Chain) {
|
||||
h.router.WithChain(chain)
|
||||
}
|
||||
|
||||
func (h *socks5Handler) Handle(ctx context.Context, conn net.Conn) {
|
||||
defer conn.Close()
|
||||
|
||||
|
@ -16,7 +16,6 @@ type metadata struct {
|
||||
authenticator auth.Authenticator
|
||||
timeout time.Duration
|
||||
readTimeout time.Duration
|
||||
retryCount int
|
||||
noTLS bool
|
||||
enableBind bool
|
||||
enableUDP bool
|
||||
@ -32,7 +31,6 @@ func (h *socks5Handler) parseMetadata(md mdata.Metadata) (err error) {
|
||||
users = "users"
|
||||
readTimeout = "readTimeout"
|
||||
timeout = "timeout"
|
||||
retryCount = "retry"
|
||||
noTLS = "notls"
|
||||
enableBind = "bind"
|
||||
enableUDP = "udp"
|
||||
@ -64,7 +62,6 @@ func (h *socks5Handler) parseMetadata(md mdata.Metadata) (err error) {
|
||||
|
||||
h.md.readTimeout = mdata.GetDuration(md, readTimeout)
|
||||
h.md.timeout = mdata.GetDuration(md, timeout)
|
||||
h.md.retryCount = mdata.GetInt(md, retryCount)
|
||||
h.md.noTLS = mdata.GetBool(md, noTLS)
|
||||
h.md.enableBind = mdata.GetBool(md, enableBind)
|
||||
h.md.enableUDP = mdata.GetBool(md, enableUDP)
|
||||
|
Reference in New Issue
Block a user