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.

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

Peek the connection to determine type of data on a CONNECT tunnel #83

Merged
merged 3 commits into from
Apr 7, 2016
Merged

Peek the connection to determine type of data on a CONNECT tunnel #83

merged 3 commits into from
Apr 7, 2016

Conversation

brandonnelson3
Copy link
Contributor

Peek the connection to determine type of data on a CONNECT tunnel, rather than assuming based on the port of the connect request.

Added test to verify this is working with multiple requests on the same connection.

…ther than assuming based on the port of the connect request
r io.Reader
}

func (c *peekedConn) Read(buf []byte) (int, error) { return c.r.Read(buf) }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add a comment to the exported function Read

@bramhaghosh
Copy link
Member

LGTM - @adamtanner want to take a look?

@admtnnr admtnnr merged commit 14101de into google:master Apr 7, 2016
@admtnnr
Copy link
Contributor

admtnnr commented Apr 7, 2016

As a side note, this is the first step needed to make #31 work/not break.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants