2e0118d1a6
## Description This PR continues the refactoring of `netx` under the following principles: 1. do not break the rest of the tree and do not engage in extensive tree-wide refactoring yet 2. move under `netxlite` clearly related subpackages (e.g., `iox`, `netxmocks`) 3. move into `internal/netxlite/internal` stuff that is clearly private of `netxlite` 4. hide implementation details in `netxlite` pending new factories 5. refactor `tls` code in `netxlite` to clearly separate `crypto/tls` code from `utls` code After each commit, I run `go test -short -race ./...` locally. Each individual commit explains what it does. I will squash, but this operation will preserve the original commit titles, so this will give further insight on each step. ## Commits * refactor: rename netxmocks -> netxlite/mocks Part of https://github.com/ooni/probe/issues/1591 * refactor: rename quicx -> netxlite/quicx See https://github.com/ooni/probe/issues/1591 * refactor: rename iox -> netxlite/iox Regenerate sources and make sure the tests pass. See https://github.com/ooni/probe/issues/1591. * refactor(iox): move MockableReader to netxlite/mocks See https://github.com/ooni/probe/issues/1591 * refactor(netxlite): generator is an implementation detail See https://github.com/ooni/probe/issues/1591 * refactor(netxlite): separate tls and utls code See https://github.com/ooni/probe/issues/1591 * refactor(netxlite): hide most types but keep old names as legacy With this change we avoid breaking the rest of the tree, but we start hiding some implementation details a bit. Factories will follow. See https://github.com/ooni/probe/issues/1591
62 lines
1.9 KiB
Go
62 lines
1.9 KiB
Go
package netxlite
|
|
|
|
import (
|
|
"errors"
|
|
"strings"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/errorsx"
|
|
)
|
|
|
|
// reduceErrors finds a known error in a list of errors since
|
|
// it's probably most relevant.
|
|
//
|
|
// Deprecation warning
|
|
//
|
|
// Albeit still used, this function is now DEPRECATED.
|
|
//
|
|
// In perspective, we would like to transition to a scenario where
|
|
// full dialing is NOT used for measurements and we return a multierror here.
|
|
func reduceErrors(errorslist []error) error {
|
|
if len(errorslist) == 0 {
|
|
return nil
|
|
}
|
|
// If we have a known error, let's consider this the real error
|
|
// since it's probably most relevant. Otherwise let's return the
|
|
// first considering that (1) local resolvers likely will give
|
|
// us IPv4 first and (2) also our resolver does that. So, in case
|
|
// the user has no IPv6 connectivity, an IPv6 error is going to
|
|
// appear later in the list of errors.
|
|
for _, err := range errorslist {
|
|
var wrapper *errorsx.ErrWrapper
|
|
if errors.As(err, &wrapper) && !strings.HasPrefix(
|
|
err.Error(), "unknown_failure",
|
|
) {
|
|
return err
|
|
}
|
|
}
|
|
// TODO(bassosimone): handle this case in a better way
|
|
return errorslist[0]
|
|
}
|
|
|
|
// These vars export internal names to legacy ooni/probe-cli code.
|
|
var (
|
|
DefaultDialer = defaultDialer
|
|
DefaultTLSHandshaker = defaultTLSHandshaker
|
|
)
|
|
|
|
// These types export internal names to legacy ooni/probe-cli code.
|
|
type (
|
|
DialerResolver = dialerResolver
|
|
DialerLogger = dialerLogger
|
|
HTTPTransportLogger = httpTransportLogger
|
|
QUICListenerStdlib = quicListenerStdlib
|
|
QUICDialerQUICGo = quicDialerQUICGo
|
|
QUICDialerResolver = quicDialerResolver
|
|
QUICDialerLogger = quicDialerLogger
|
|
ResolverSystem = resolverSystem
|
|
ResolverLogger = resolverLogger
|
|
ResolverIDNA = resolverIDNA
|
|
TLSHandshakerConfigurable = tlsHandshakerConfigurable
|
|
TLSHandshakerLogger = tlsHandshakerLogger
|
|
)
|