Skip to content

Commit 6b57c8c

Browse files
committed
cleanup(netxlite): QUICListener -> UDPListener
I am reasoning about ooni/probe#2531 and thus reading the codebase. I stumbled upon this inconsistency. While there, I noticed some documentation also needed updating.
1 parent 43f1980 commit 6b57c8c

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

internal/netemx/oohelperd.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func (f *OOHelperDFactory) NewHandler(env NetStackServerFactoryEnv, unet *netem.
3535

3636
handler.NewQUICDialer = func(logger model.Logger) model.QUICDialer {
3737
return netx.NewQUICDialerWithResolver(
38-
netx.NewQUICListener(),
38+
netx.NewUDPListener(),
3939
logger,
4040
netx.NewStdlibResolver(logger),
4141
)

internal/netxlite/netx.go

+11-11
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ package netxlite
88
import "github.com/ooni/probe-cli/v3/internal/model"
99

1010
// TODO(bassosimone,kelmenhorst): we should gradually refactor the top-level netxlite
11-
// functions to operate on a [Net] struct using a nil-initialized Underlying field.
11+
// functions to operate on a [Netx] struct using a nil-initialized Underlying field.
1212

1313
// Netx allows constructing netxlite data types using a specific [model.UnderlyingNetwork].
1414
type Netx struct {
@@ -23,7 +23,7 @@ func (n *Netx) tproxyNilSafeProvider() *MaybeCustomUnderlyingNetwork {
2323
}
2424

2525
// NewStdlibResolver is like [netxlite.NewStdlibResolver] but the constructed [model.Resolver]
26-
// uses the [UnderlyingNetwork] configured inside the [Net] structure.
26+
// uses the [model.UnderlyingNetwork] configured inside the [Netx] structure.
2727
func (n *Netx) NewStdlibResolver(logger model.DebugLogger, wrappers ...model.DNSTransportWrapper) model.Resolver {
2828
unwrapped := &resolverSystem{
2929
t: WrapDNSTransport(&dnsOverGetaddrinfoTransport{provider: n.tproxyNilSafeProvider()}, wrappers...),
@@ -32,19 +32,19 @@ func (n *Netx) NewStdlibResolver(logger model.DebugLogger, wrappers ...model.DNS
3232
}
3333

3434
// NewDialerWithResolver is like [netxlite.NewDialerWithResolver] but the constructed [model.Dialer]
35-
// uses the [UnderlyingNetwork] configured inside the [Net] structure.
35+
// uses the [model.UnderlyingNetwork] configured inside the [Netx] structure.
3636
func (n *Netx) NewDialerWithResolver(dl model.DebugLogger, r model.Resolver, w ...model.DialerWrapper) model.Dialer {
3737
return WrapDialer(dl, r, &DialerSystem{provider: n.tproxyNilSafeProvider()}, w...)
3838
}
3939

40-
// NewQUICListener is like [netxlite.NewQUICListener] but the constructed [model.QUICListener]
41-
// uses the [UnderlyingNetwork] configured inside the [Net] structure.
42-
func (n *Netx) NewQUICListener() model.UDPListener {
40+
// NewUDPListener is like [netxlite.NewUDPListener] but the constructed [model.UDPListener]
41+
// uses the [model.UnderlyingNetwork] configured inside the [Netx] structure.
42+
func (n *Netx) NewUDPListener() model.UDPListener {
4343
return &udpListenerErrWrapper{&udpListenerStdlib{provider: n.tproxyNilSafeProvider()}}
4444
}
4545

4646
// NewQUICDialerWithResolver is like [netxlite.NewQUICDialerWithResolver] but the constructed
47-
// [model.QUICDialer] uses the [UnderlyingNetwork] configured inside the [Net] structure.
47+
// [model.QUICDialer] uses the [model.UnderlyingNetwork] configured inside the [Netx] structure.
4848
func (n *Netx) NewQUICDialerWithResolver(listener model.UDPListener, logger model.DebugLogger,
4949
resolver model.Resolver, wrappers ...model.QUICDialerWrapper) (outDialer model.QUICDialer) {
5050
baseDialer := &quicDialerQUICGo{
@@ -55,23 +55,23 @@ func (n *Netx) NewQUICDialerWithResolver(listener model.UDPListener, logger mode
5555
}
5656

5757
// NewTLSHandshakerStdlib is like [netxlite.NewTLSHandshakerStdlib] but the constructed [model.TLSHandshaker]
58-
// uses the [UnderlyingNetwork] configured inside the [Net] structure.
58+
// uses the [model.UnderlyingNetwork] configured inside the [Netx] structure.
5959
func (n *Netx) NewTLSHandshakerStdlib(logger model.DebugLogger) model.TLSHandshaker {
6060
return newTLSHandshakerLogger(&tlsHandshakerConfigurable{provider: n.tproxyNilSafeProvider()}, logger)
6161
}
6262

6363
// NewHTTPTransportStdlib is like [netxlite.NewHTTPTransportStdlib] but the constructed [model.HTTPTransport]
64-
// uses the [UnderlyingNetwork] configured inside the [Net] structure.
64+
// uses the [model.UnderlyingNetwork] configured inside the [Netx] structure.
6565
func (n *Netx) NewHTTPTransportStdlib(logger model.DebugLogger) model.HTTPTransport {
6666
dialer := n.NewDialerWithResolver(logger, n.NewStdlibResolver(logger))
6767
tlsDialer := NewTLSDialer(dialer, n.NewTLSHandshakerStdlib(logger))
6868
return NewHTTPTransport(logger, dialer, tlsDialer)
6969
}
7070

7171
// NewHTTP3TransportStdlib is like [netxlite.NewHTTP3TransportStdlib] but the constructed [model.HTTPTransport]
72-
// uses the [UnderlyingNetwork] configured inside the [Net] structure.
72+
// uses the [model.UnderlyingNetwork] configured inside the [Netx] structure.
7373
func (n *Netx) NewHTTP3TransportStdlib(logger model.DebugLogger) model.HTTPTransport {
74-
ql := n.NewQUICListener()
74+
ql := n.NewUDPListener()
7575
reso := n.NewStdlibResolver(logger)
7676
qd := n.NewQUICDialerWithResolver(ql, logger, reso)
7777
return NewHTTP3Transport(logger, qd, nil)

0 commit comments

Comments
 (0)