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

Bug4700 #343

Merged
9 commits merged into from
Sep 21, 2018
Merged

Bug4700 #343

9 commits merged into from
Sep 21, 2018

Conversation

asn-d6
Copy link
Member

@asn-d6 asn-d6 commented Sep 15, 2018

No description provided.

Mahrud Sayrafi and others added 8 commits September 12, 2018 15:20
Moves code to a function, better viewed with --color-moved.
- Change default values.
- Beautify.
- Documentation.
Had to move a function to test helpers.
Without this patch we would encode the IPv6 address' last part as
::ffffffff instead of ::ffff:ffff when the GID is UINT32_MAX.

See: https://bugs.torproject.org/4700
…rotocol.

This patch changes HiddenServiceExportCircuitID so instead of being a
boolean it takes a string, which is the protocol. Currently only the
'haproxy' protocol is defined.

See: https://bugs.torproject.org/4700
@coveralls
Copy link

coveralls commented Sep 15, 2018

Coverage Status

Coverage increased (+0.008%) to 61.833% when pulling 3477a73 on asn-d6:bug4700 into 035166e on torproject:master.

uint32_t gid = 0; /* default value */

/* Generate a GID and source port for this client */
if (edge_conn->on_circuit != NULL) {
Copy link
Member

Choose a reason for hiding this comment

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

Does it ever happen that this one is NULL? And in that case having gid = 0 is fine? Or should we guard this one with BUG()?

This patch moves the logic that adds the proxy headers to an earlier
point in the exit connection lifetime, which ensures that the
application data cannot be written to the outbuf before the proxy header
is added.

See: https://bugs.torproject.org/4700
@ghost ghost merged commit 3477a73 into torproject:master Sep 21, 2018
This pull request was closed.
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