c/ooni-probe-cli
Watch
1
0
Fork
You've already forked ooni-probe-cli
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cleanup(netx): stop using most netxlite resolver internals (#797)

Browse source 
This diff modifies netx to stop using most netxlite resolver internals
but the internal function that creates a new, unwrapped system resolver,
which will be dealt with in a subsequent pull request.

See https://github.com/ooni/probe/issues/2121
This commit is contained in:
Simone Basso 2022-06-05 19:52:39 +02:00 • committed by GitHub
commit 2d3d5d9cdc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 243 deletions
Download patch file Download diff file Expand all files Collapse all files

18
internal/engine/netx/netx.go
View file

@ -63,10 +63,10 @@ func NewResolver(config Config) model.Resolver {
if config.BaseResolver == nil {
config.BaseResolver = netxlite.NewResolverSystem()
}
var r model.Resolver = config.BaseResolver
r = &netxlite.AddressResolver{
Resolver: r,
}
r := netxlite.WrapResolver(
model.ValidLoggerOrDefault(config.Logger),
config.BaseResolver,
)
if config.CacheResolutions {
r = &CacheResolver{Resolver: r}
}
@ -80,15 +80,7 @@ func NewResolver(config Config) model.Resolver {
if config.BogonIsError {
r = &netxlite.BogonResolver{Resolver: r}
}
r = &netxlite.ErrorWrapperResolver{Resolver: r}
if config.Logger != nil {
r = &netxlite.ResolverLogger{
Logger: config.Logger,
Resolver: r,
}
}
r = config.Saver.WrapResolver(r) // WAI when config.Saver==nil
return &netxlite.ResolverIDNA{Resolver: r}
return config.Saver.WrapResolver(r) // WAI when config.Saver==nil
}
// NewDialer creates a new Dialer from the specified config