diff --git a/config/loader/loader.go b/config/loader/loader.go index dff051a2..0b4d93fa 100644 --- a/config/loader/loader.go +++ b/config/loader/loader.go @@ -78,12 +78,12 @@ func (l *loader) Load(cfg *config.Config) error { } logger.SetDefault(logger_parser.ParseLogger(&config.LoggerConfig{Log: logCfg})) + parsing.SetDefaultTLSConfig(tlsCfg) + if err := register(cfg); err != nil { return err } - parsing.SetDefaultTLSConfig(tlsCfg) - return nil } diff --git a/handler/socks/v5/selector.go b/handler/socks/v5/selector.go index 683396b2..700416df 100644 --- a/handler/socks/v5/selector.go +++ b/handler/socks/v5/selector.go @@ -29,7 +29,7 @@ func (s *serverSelector) Select(methods ...uint8) (method uint8) { s.logger.Debugf("%d %d %v", gosocks5.Ver5, len(methods), methods) method = gosocks5.MethodNoAuth for _, m := range methods { - if m == socks.MethodTLS && !s.noTLS { + if m == socks.MethodTLS && !s.noTLS && s.TLSConfig != nil { method = m break }