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

Bug31356+logs rebased2 #1230

Merged

Conversation

Labels
None yet
Projects
None yet
3 participants
@mikeperry-tor
Copy link
Contributor

@mikeperry-tor mikeperry-tor commented Aug 12, 2019

No description provided.

Also add controller circuit id to all relevant circpad loglines. This will
make debugging any future issues like #30992 much easier.
This can happen, it's not great, but it's not the worst thing in the world
either. Deferring full fix for 0.4.2/later.
By binding the protover numbering to specific padding machines, we can make
our padding negotiation simpler. We probably should have done this in the
first place.

This has the side effect that earlier 0.4.1.x-alpha clients won't negotiate
with 0.4.1.x-stable relays, and 0.4.1.x-stable clients won't negotiate with
earlier 0.4.1.x-alpha relays (or 0.4.0.x relays). Since we don't support
alphas after the stable is released, this is fine, so long as it gets in
before the first stable of 0.4.1.x.
Also document the other log changes in this branch.
@@ -841,8 +841,8 @@ typedef struct protover_summary_flags_t {
unsigned int supports_v3_rendezvous_point: 1;

/** True iff this router has a protocol list that allows clients to
* negotiate link-level padding. Requires Padding>=1. */
unsigned int supports_padding : 1;
* negotiate hs circuit setup padding. Requires Padding>=2. */
Copy link
Contributor

@teor2345 teor2345 Aug 19, 2019

This comment is a bit confusing.
When we remove Padding=2, 0.4.1 will stop negotiating padding, even if we have added Padding=3.

I think this is a decent fix, but I'd be happy with any clarification:

Suggested change
* negotiate hs circuit setup padding. Requires Padding>=2. */
* negotiate hs circuit setup padding. Requires Padding=2-*
* Padding=2 will always be used for HS circuit setup.
* Future padding versions will introduce support for other
* machines.
*/

@torproject-pusher torproject-pusher merged commit 6deba34 into torproject:maint-0.4.1 Aug 19, 2019
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment