refactor: only use shaping dialer for ndt7 and dash (#754)

See https://github.com/ooni/probe/issues/2112 for context.

While there, run `go fix -fix buildtag ./...`
This commit is contained in:
Simone Basso
2022-05-24 18:23:42 +02:00
committed by GitHub
parent b68b8e1e8f
commit 6924d1ad81
17 changed files with 126 additions and 65 deletions
+3
View File
@@ -42,6 +42,9 @@ func (mgr dialManager) dialWithTestName(ctx context.Context, testName string) (*
Logger: mgr.logger,
ProxyURL: mgr.proxyURL,
}, reso)
// Implements shaping if the user builds using `-tags shaping`
// See https://github.com/ooni/probe/issues/2112
dlr = netxlite.NewMaybeShapingDialer(dlr)
// We force using our bundled CA pool, which should fix
// https://github.com/ooni/probe/issues/2031
tlsConfig := &tls.Config{