diff --git a/dns/dns.go b/dns/dns.go index 961d291..a5ea456 100644 --- a/dns/dns.go +++ b/dns/dns.go @@ -26,16 +26,16 @@ type Dns struct { dohClient Resolver } -func NewResolver(config *util.Config) *Dns { +func NewDns(config *util.Config) *Dns { addr := *config.DnsAddr port := strconv.Itoa(*config.DnsPort) return &Dns{ host: *config.DnsAddr, port: port, - systemClient: client.NewSystemResolver(), - generalClient: client.NewGeneralResolver(net.JoinHostPort(addr, port)), - dohClient: client.NewDOHResolver(addr), + systemClient: resolver.NewSystemResolver(), + generalClient: resolver.NewGeneralResolver(net.JoinHostPort(addr, port)), + dohClient: resolver.NewDOHResolver(addr), } } diff --git a/dns/resolver/doh.go b/dns/resolver/doh.go index 1d4a906..c9350a5 100644 --- a/dns/resolver/doh.go +++ b/dns/resolver/doh.go @@ -1,4 +1,4 @@ -package client +package resolver import ( "bytes" diff --git a/dns/resolver/general.go b/dns/resolver/general.go index 2f005e6..7992f7d 100644 --- a/dns/resolver/general.go +++ b/dns/resolver/general.go @@ -1,4 +1,4 @@ -package client +package resolver import ( "context" diff --git a/dns/resolver/resolver.go b/dns/resolver/resolver.go index 2e1f237..298a101 100644 --- a/dns/resolver/resolver.go +++ b/dns/resolver/resolver.go @@ -1,4 +1,4 @@ -package client +package resolver import ( "context" diff --git a/dns/resolver/system.go b/dns/resolver/system.go index 088d8b2..4af716e 100644 --- a/dns/resolver/system.go +++ b/dns/resolver/system.go @@ -1,4 +1,4 @@ -package client +package resolver import ( "context" diff --git a/proxy/proxy.go b/proxy/proxy.go index f4630c2..c2beec6 100644 --- a/proxy/proxy.go +++ b/proxy/proxy.go @@ -31,7 +31,7 @@ func New(config *util.Config) *Proxy { windowSize: *config.WindowSize, enableDoh: *config.EnableDoh, allowedPattern: config.AllowedPatterns, - resolver: dns.NewResolver(config), + resolver: dns.NewDns(config), } }