c/ooni-probe-cli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(netxlite): more abstract proxy-enabled dialer construction (#812)

Browse Source 
This will help with https://github.com/ooni/probe/issues/2135
This commit is contained in:
Simone Basso
2022-06-08 23:10:06 +02:00
committed by GitHub
parent bf7ea423d3
commit 1a706e47bc
4 changed files with 44 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/engine/netx/dialer.go
+1 -1
View File
@@ -21,7 +21,7 @@ func NewDialer(config Config) model.Dialer {
logger, config.FullResolver, config.Saver.NewConnectObserver(),
config.ReadWriteSaver.NewReadWriteObserver(),
)
d = netxlite.NewMaybeProxyDialer(d, config.ProxyURL)
d = netxlite.MaybeWrapWithProxyDialer(d, config.ProxyURL)
d = bytecounter.MaybeWrapWithContextAwareDialer(config.ContextByteCounting, d)
return d
}
internal/engine/session.go
+1 -1
View File
@@ -198,7 +198,7 @@ func NewSession(ctx context.Context, config SessionConfig) (*Session, error) {
ProxyURL: proxyURL,
}
dialer := netxlite.NewDialerWithResolver(sess.logger, sess.resolver)
dialer = netxlite.NewMaybeProxyDialer(dialer, proxyURL)
dialer = netxlite.MaybeWrapWithProxyDialer(dialer, proxyURL)
handshaker := netxlite.NewTLSHandshakerStdlib(sess.logger)
tlsDialer := netxlite.NewTLSDialer(dialer, handshaker)
txp := netxlite.NewHTTPTransport(sess.logger, dialer, tlsDialer)