refactor(netx): move construction logic outside package (#798)
For testability, replace most if-based construction logic with calls to well-tested factories living in other packages. While there, acknowledge that a bunch of types could now be private and make them private, modifying the code to call the public factories allowing to construct said types instead. Part of https://github.com/ooni/probe/issues/2121
This commit is contained in:
parent
2d3d5d9cdc
commit
6b85dfce88
20 changed files with 475 additions and 184 deletions
|
|
@ -163,8 +163,8 @@ func (lst *Listener) handleSocksConn(ctx context.Context, socksConn ptxSocksConn
|
|||
// We _must_ wrap the ptConn. Wrapping the socks conn leads us to
|
||||
// count the sent bytes as received and the received bytes as sent:
|
||||
// bytes flow in the opposite direction there for the socks conn.
|
||||
ptConn = bytecounter.MaybeWrap(ptConn, lst.SessionByteCounter)
|
||||
ptConn = bytecounter.MaybeWrap(ptConn, lst.ExperimentByteCounter)
|
||||
ptConn = bytecounter.MaybeWrapConn(ptConn, lst.SessionByteCounter)
|
||||
ptConn = bytecounter.MaybeWrapConn(ptConn, lst.ExperimentByteCounter)
|
||||
lst.forwardWithContext(ctx, socksConn, ptConn) // transfer ownership
|
||||
return nil // used for testing
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue