tcpproxy: add pause and resume to the stream #119
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rogpeppe
approved these changes
Feb 3, 2017
tcpproxy.go
Outdated
| @@ -33,6 +38,7 @@ func NewTCPProxy(c *gc.C, remoteAddr string) *TCPProxy { | |||
| p := &TCPProxy{ | |||
| listener: listener, | |||
| } | |||
| p.stopStart = sync.NewCond(&p.mu) | |||
There was a problem hiding this comment.
Or, if you declare stopStart as a value not a pointer, then:
p.stopStart.L = &p.mu
tcpproxy.go
Outdated
| @@ -91,6 +97,24 @@ func (p *TCPProxy) CloseConns() { | |||
| } | |||
| } | |||
|
|
|||
| // PauseConns stops traffic flowing through all the connections that are | |||
There was a problem hiding this comment.
Actually, it pauses all traffic, so perhaps:
// PauseConns stops all traffic flowing through the proxy.
?
tcpproxy.go
Outdated
| io.Copy(dst, src) | ||
| buf := make([]byte, 32*1024) | ||
| for { | ||
| nr, er := src.Read(buf) |
There was a problem hiding this comment.
Since you're not bothered about the actual errors, I'd name the error variables just as conventional "err".
| @@ -140,3 +177,15 @@ func assertEOF(c *gc.C, r io.Reader) { | |||
| c.Assert(err, gc.Equals, io.EOF) | |||
| c.Assert(n, gc.Equals, 0) | |||
| } | |||
|
|
|||
| func assertReadTimeout(c *gc.C, conn net.Conn) { | |||
| err := conn.SetReadDeadline(time.Now().Add(500 * time.Millisecond)) | |||
mattyw
approved these changes
Feb 3, 2017
This allows servers that are not responding in a timely manner to be simulated.
e810f2f to
b567b5e
Compare
|
|
|
Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju-testing |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This allows servers that are not responding in a timely manner to be
simulated.