Improve DNS log

This commit is contained in:
世界 2023-01-02 14:28:01 +08:00
parent f5c5570bec
commit 53d9ad93e3
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
3 changed files with 4 additions and 4 deletions

2
go.mod
View file

@ -24,7 +24,7 @@ require (
github.com/sagernet/cloudflare-tls v0.0.0-20221031050923-d70792f4c3a0 github.com/sagernet/cloudflare-tls v0.0.0-20221031050923-d70792f4c3a0
github.com/sagernet/quic-go v0.0.0-20221206044826-d15273f58d82 github.com/sagernet/quic-go v0.0.0-20221206044826-d15273f58d82
github.com/sagernet/sing v0.1.2-0.20221226041200-d8c779c030ba github.com/sagernet/sing v0.1.2-0.20221226041200-d8c779c030ba
github.com/sagernet/sing-dns v0.1.1-0.20221219051000-4eff25693772 github.com/sagernet/sing-dns v0.1.1-0.20230103023532-65d2a9affde4
github.com/sagernet/sing-shadowsocks v0.1.0 github.com/sagernet/sing-shadowsocks v0.1.0
github.com/sagernet/sing-tun v0.1.1-0.20221128044455-b22d9eb41b74 github.com/sagernet/sing-tun v0.1.1-0.20221128044455-b22d9eb41b74
github.com/sagernet/sing-vmess v0.1.1-0.20221206050106-bcacd436d74c github.com/sagernet/sing-vmess v0.1.1-0.20221206050106-bcacd436d74c

4
go.sum
View file

@ -152,8 +152,8 @@ github.com/sagernet/sing v0.0.0-20220812082120-05f9836bff8f/go.mod h1:QVsS5L/ZA2
github.com/sagernet/sing v0.0.0-20220817130738-ce854cda8522/go.mod h1:QVsS5L/ZA2Q5UhQwLrn0Trw+msNd/NPGEhBKR/ioWiY= github.com/sagernet/sing v0.0.0-20220817130738-ce854cda8522/go.mod h1:QVsS5L/ZA2Q5UhQwLrn0Trw+msNd/NPGEhBKR/ioWiY=
github.com/sagernet/sing v0.1.2-0.20221226041200-d8c779c030ba h1:5HEoylnFXFO7CuJGzJaK7PzOdVT5DKmqZash6H5a1b0= github.com/sagernet/sing v0.1.2-0.20221226041200-d8c779c030ba h1:5HEoylnFXFO7CuJGzJaK7PzOdVT5DKmqZash6H5a1b0=
github.com/sagernet/sing v0.1.2-0.20221226041200-d8c779c030ba/go.mod h1:bvmen56QnVbMrWy+nr5nsbz7U5MUPuY0L0S/XfhCsTs= github.com/sagernet/sing v0.1.2-0.20221226041200-d8c779c030ba/go.mod h1:bvmen56QnVbMrWy+nr5nsbz7U5MUPuY0L0S/XfhCsTs=
github.com/sagernet/sing-dns v0.1.1-0.20221219051000-4eff25693772 h1:S68UdEI7911P868k6pualoxqK8lwQjdx6Xt00ybsVLA= github.com/sagernet/sing-dns v0.1.1-0.20230103023532-65d2a9affde4 h1:W71h5uJacalWG504OIttwItBcg0XdsfLqC14awAjsZ0=
github.com/sagernet/sing-dns v0.1.1-0.20221219051000-4eff25693772/go.mod h1:IXw6t1F25YvzmgCgV2kKySf4XCEKkUJnmLvKCd7jFEc= github.com/sagernet/sing-dns v0.1.1-0.20230103023532-65d2a9affde4/go.mod h1:IXw6t1F25YvzmgCgV2kKySf4XCEKkUJnmLvKCd7jFEc=
github.com/sagernet/sing-shadowsocks v0.1.0 h1:cDmmOkA11fzVdhyCZQEeI3ozQz+59rj8+rqPb91xux4= github.com/sagernet/sing-shadowsocks v0.1.0 h1:cDmmOkA11fzVdhyCZQEeI3ozQz+59rj8+rqPb91xux4=
github.com/sagernet/sing-shadowsocks v0.1.0/go.mod h1:O5LtOs8Ivw686FqLpO0Zu+A0ROVE15VeqEK3yDRRAms= github.com/sagernet/sing-shadowsocks v0.1.0/go.mod h1:O5LtOs8Ivw686FqLpO0Zu+A0ROVE15VeqEK3yDRRAms=
github.com/sagernet/sing-tun v0.1.1-0.20221128044455-b22d9eb41b74 h1:T6U4VNWwxQjr80I6RcQA1lTrWgwQ0vMq1UsnlzeqgxI= github.com/sagernet/sing-tun v0.1.1-0.20221128044455-b22d9eb41b74 h1:T6U4VNWwxQjr80I6RcQA1lTrWgwQ0vMq1UsnlzeqgxI=

View file

@ -123,12 +123,12 @@ func NewRouter(ctx context.Context, logFactory log.Factory, options option.Route
geositeOptions: common.PtrValueOrDefault(options.Geosite), geositeOptions: common.PtrValueOrDefault(options.Geosite),
geositeCache: make(map[string]adapter.Rule), geositeCache: make(map[string]adapter.Rule),
defaultDetour: options.Final, defaultDetour: options.Final,
dnsClient: dns.NewClient(dnsOptions.DNSClientOptions.DisableCache, dnsOptions.DNSClientOptions.DisableExpire),
defaultDomainStrategy: dns.DomainStrategy(dnsOptions.Strategy), defaultDomainStrategy: dns.DomainStrategy(dnsOptions.Strategy),
autoDetectInterface: options.AutoDetectInterface, autoDetectInterface: options.AutoDetectInterface,
defaultInterface: options.DefaultInterface, defaultInterface: options.DefaultInterface,
defaultMark: options.DefaultMark, defaultMark: options.DefaultMark,
} }
router.dnsClient = dns.NewClient(dnsOptions.DNSClientOptions.DisableCache, dnsOptions.DNSClientOptions.DisableExpire, router.dnsLogger)
for i, ruleOptions := range options.Rules { for i, ruleOptions := range options.Rules {
routeRule, err := NewRule(router, router.logger, ruleOptions) routeRule, err := NewRule(router, router.logger, ruleOptions)
if err != nil { if err != nil {