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(geolocate): use netxlite rather than netx (#756)

Browse source 
See https://github.com/ooni/probe/issues/2114
This commit is contained in:
Simone Basso 2022-05-25 09:12:02 +02:00 • committed by GitHub
commit 09523f8efb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
internal/engine/geolocate/iplookup.go
View file

@ -9,9 +9,9 @@ import (
"net/http"
"time"
"github.com/ooni/probe-cli/v3/internal/engine/netx"
"github.com/ooni/probe-cli/v3/internal/model"
"github.com/ooni/probe-cli/v3/internal/multierror"
"github.com/ooni/probe-cli/v3/internal/netxlite"
)
var (
@ -86,10 +86,11 @@ func (c ipLookupClient) doWithCustomFunc(
// Implementation note: we MUST use an HTTP client that we're
// sure IS NOT using any proxy. To this end, we construct a
// client ourself that we know is not proxied.
clnt := &http.Client{Transport: netx.NewHTTPTransport(netx.Config{
Logger: c.Logger,
FullResolver: c.Resolver,
})}
dialer := netxlite.NewDialerWithResolver(c.Logger, c.Resolver)
handshaker := netxlite.NewTLSHandshakerStdlib(c.Logger)
tlsDialer := netxlite.NewTLSDialer(dialer, handshaker)
txp := netxlite.NewHTTPTransport(c.Logger, dialer, tlsDialer)
clnt := &http.Client{Transport: txp}
defer clnt.CloseIdleConnections()
ip, err := fn(ctx, clnt, c.Logger, c.UserAgent)
if err != nil {