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

refactor: continue to simplify engine/netx (#769)

Browse source 
The objective of this diff is to simplify the code inside engine/netx
while moving more bits of code inside netxlite.

See https://github.com/ooni/probe/issues/2121
This commit is contained in:
Simone Basso 2022-05-31 08:11:07 +02:00 • committed by GitHub
commit e4f10eeac2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 312 additions and 344 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -97,7 +97,7 @@ func NewResolver(config Config) model.Resolver {
r = cache
}
if config.BogonIsError {
r = resolver.BogonResolver{Resolver: r}
r = &netxlite.BogonResolver{Resolver: r}
}
r = &netxlite.ErrorWrapperResolver{Resolver: r}
if config.Logger != nil {
@ -202,7 +202,7 @@ func NewHTTPTransport(config Config) model.HTTPTransport {
TLSConfig: config.TLSConfig})
if config.ByteCounter != nil {
txp = &httptransport.ByteCountingTransport{
txp = &bytecounter.HTTPTransport{
Counter: config.ByteCounter, HTTPTransport: txp}
}
if config.Logger != nil {