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(netxlite): better integration with tracex (#774)

Browse source 
Rather than passing functions to construct complex objects such
as Dialer and QUICDialer, pass interface implementations.

Ensure that a nil implementation does not cause harm.

Make Saver implement the correct interface either directly or
indirectly. We need to implement the correct interface indirectly
for TCP conns (or connected UDP sockets) because we have two
distinct use cases inside netx: observing just the connect event
and observing just the I/O events.

With this change, the construction of composed Dialers and
QUICDialers is greatly simplified and more obvious.

Part of https://github.com/ooni/probe/issues/2121
This commit is contained in:
Simone Basso 2022-06-01 08:31:20 +02:00 • committed by GitHub
commit 7e0b47311d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 119 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -132,12 +132,7 @@ func NewQUICDialer(config Config) model.QUICDialer {
if config.Logger != nil {
logger = config.Logger
}
extensions := []netxlite.QUICDialerWrapper{
func(dialer model.QUICDialer) model.QUICDialer {
return config.TLSSaver.WrapQUICDialer(dialer) // robust to nil TLSSaver
},
}
return netxlite.NewQUICDialerWithResolver(ql, logger, config.FullResolver, extensions...)
return netxlite.NewQUICDialerWithResolver(ql, logger, config.FullResolver, config.TLSSaver)
}
// NewTLSDialer creates a new TLSDialer from the specified config