Skip to content

refactor(netxlite): use *Netx for creating QUIC dialers #1251

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 12, 2023
Merged

refactor(netxlite): use *Netx for creating QUIC dialers #1251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions internal/netxlite/netx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,6 @@ func (netx *Netx) maybeCustomUnderlyingNetwork() *MaybeCustomUnderlyingNetwork {
return &MaybeCustomUnderlyingNetwork{netx.Underlying}
}

// NewQUICDialerWithResolver is like [netxlite.NewQUICDialerWithResolver] but the constructed
// [model.QUICDialer] uses the [model.UnderlyingNetwork] configured inside the [Netx] structure.
func (n *Netx) NewQUICDialerWithResolver(listener model.UDPListener, logger model.DebugLogger,
resolver model.Resolver, wrappers ...model.QUICDialerWrapper) (outDialer model.QUICDialer) {
baseDialer := &quicDialerQUICGo{
UDPListener: listener,
provider: n.maybeCustomUnderlyingNetwork(),
}
return WrapQUICDialer(logger, resolver, baseDialer, wrappers...)
}

// NewTLSHandshakerStdlib is like [netxlite.NewTLSHandshakerStdlib] but the constructed [model.TLSHandshaker]
// uses the [model.UnderlyingNetwork] configured inside the [Netx] structure.
func (n *Netx) NewTLSHandshakerStdlib(logger model.DebugLogger) model.TLSHandshaker {
Expand Down
19 changes: 14 additions & 5 deletions internal/netxlite/quic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,29 @@ import (
//
// Please, note that this fuunction will just ignore any nil wrapper.
//
// Unlike the dialer returned by WrapDialer, this dialer MAY attempt
// Unlike the dialer returned by NewDialerWithResolver, this dialer MAY attempt
// happy eyeballs, perform parallel dial attempts, and return an error
// that aggregates all the errors that occurred.
func NewQUICDialerWithResolver(listener model.UDPListener, logger model.DebugLogger,
func (netx *Netx) NewQUICDialerWithResolver(listener model.UDPListener, logger model.DebugLogger,
resolver model.Resolver, wrappers ...model.QUICDialerWrapper) (outDialer model.QUICDialer) {
baseDialer := &quicDialerQUICGo{
UDPListener: listener,
provider: netx.maybeCustomUnderlyingNetwork(),
}
return WrapQUICDialer(logger, resolver, baseDialer, wrappers...)
return wrapQUICDialer(logger, resolver, baseDialer, wrappers...)
}

// NewQUICDialerWithResolver is equivalent to creating an empty [*Netx]
// and calling its NewQUICDialerWithResolver method.
func NewQUICDialerWithResolver(listener model.UDPListener, logger model.DebugLogger,
resolver model.Resolver, wrappers ...model.QUICDialerWrapper) (outDialer model.QUICDialer) {
netx := &Netx{Underlying: nil}
return netx.NewQUICDialerWithResolver(listener, logger, resolver, wrappers...)
}

// WrapQUICDialer is similar to NewQUICDialerWithResolver except that it takes as
// wrapQUICDialer is similar to NewQUICDialerWithResolver except that it takes as
// input an already constructed [model.QUICDialer] instead of creating one.
func WrapQUICDialer(logger model.DebugLogger, resolver model.Resolver,
func wrapQUICDialer(logger model.DebugLogger, resolver model.Resolver,
baseDialer model.QUICDialer, wrappers ...model.QUICDialerWrapper) (outDialer model.QUICDialer) {
outDialer = &quicDialerErrWrapper{
QUICDialer: &quicDialerHandshakeCompleter{
Expand Down