Skip to content
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

refactor(netxlite): use *Netx for creating TLS handshakers #1252

Merged
merged 2 commits into from
Sep 12, 2023
Merged

refactor(netxlite): use *Netx for creating TLS handshakers #1252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72ed22f
refactor(netxlite): use *Netx for creating TLS handshakers
bassosimone Sep 12, 2023
8a41cdf
x
bassosimone Sep 12, 2023
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
6 changes: 0 additions & 6 deletions internal/netxlite/netx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,6 @@ func (netx *Netx) maybeCustomUnderlyingNetwork() *MaybeCustomUnderlyingNetwork {
return &MaybeCustomUnderlyingNetwork{netx.Underlying}
}

// 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 {
return newTLSHandshakerLogger(&tlsHandshakerConfigurable{provider: n.maybeCustomUnderlyingNetwork()}, logger)
}

// NewHTTPTransportStdlib is like [netxlite.NewHTTPTransportStdlib] but the constructed [model.HTTPTransport]
// uses the [model.UnderlyingNetwork] configured inside the [Netx] structure.
func (n *Netx) NewHTTPTransportStdlib(logger model.DebugLogger) model.HTTPTransport {
Expand Down
12 changes: 11 additions & 1 deletion internal/netxlite/tls.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,18 @@ var _ TLSConn = &tls.Conn{}
//
// 3. that we are going to use Mozilla CA if the [tls.Config]
// RootCAs field is zero initialized.
func (netx *Netx) NewTLSHandshakerStdlib(logger model.DebugLogger) model.TLSHandshaker {
return newTLSHandshakerLogger(
&tlsHandshakerConfigurable{provider: netx.maybeCustomUnderlyingNetwork()},
logger,
)
}

// NewTLSHandshakerStdlib is equivalent to creating an empty [*Netx]
// and calling its NewTLSHandshakerStdlib method.
func NewTLSHandshakerStdlib(logger model.DebugLogger) model.TLSHandshaker {
return newTLSHandshakerLogger(&tlsHandshakerConfigurable{}, logger)
netx := &Netx{Underlying: nil}
return netx.NewTLSHandshakerStdlib(logger)
}

// newTLSHandshakerLogger creates a new tlsHandshakerLogger instance.
Expand Down