Publish bridge ServerTransportPlugin lines, even when ExtraInfoStatistics are off
In #29018 (moved), we disabled all extrainfo contents when ExtraInfoStatistics is off.
But we need to publish the ServerTransportPlugin lines for bridges, even when their statistics are off.
See https://trac.torproject.org/projects/tor/ticket/30441#comment:13 for details.
- Show closed items
Activity
-
Newest first Oldest first
-
Show all activity Show comments only Show history only
- teor changed milestone to %Tor: 0.4.1.x-final
changed milestone to %Tor: 0.4.1.x-final
Trac:
Parent Ticket: #30441 (moved)- teor added 041-backport 041-regression actualpoints::0.4 component::core tor/tor milestone::Tor: 0.4.1.x-final nickm-merge owner::teor parent::30441 points::0.2 priority::medium regression resolution::fixed reviewer::nickm severity::normal sponsor31-maybe status::closed tor-bridge tor-pt type::defect version::tor 0.4.1.1-alpha labels
added 041-backport 041-regression actualpoints::0.4 component::core tor/tor milestone::Tor: 0.4.1.x-final nickm-merge owner::teor parent::30441 points::0.2 priority::medium regression resolution::fixed reviewer::nickm severity::normal sponsor31-maybe status::closed tor-bridge tor-pt type::defect version::tor 0.4.1.1-alpha labels
Gaba, this ticket can go in sponsor 31 for the refactoring, or a pluggable transport sponsor for the bugfix.
See my pull request:
I put the pluggable transport lines straight after the header. This conforms to the spec, because the lines can be in any order. And it makes the code simpler. It also makes the pluggable transport lines less likely to be removed if the extra info descriptor is too big (50 KB, so that's unlikely).
I also did a quick refactor to satisfy practracker on master:
This makes the file bigger, but all the functions are under 100 lines.
Trac:
Actualpoints: 0.2 to 0.4
Cc: N/A to gaba
Status: assigned to needs_review
Keywords: N/A deleted, 041-backport, sponsor31-maybe, regression addedTrac:
Keywords: N/A deleted, 041-regression addedThis LGTM; I would like to get it into 0.4.1.3-alpha.
Trac:
Reviewer: N/A to nickm
Status: needs_review to merge_ready
Keywords: N/A deleted, dgoulet-merge added- Developer
I think this looks good. Only very minor nitpick I could think of is to change the type of
emit_ed_sigs
fromint
tobool
, but I don't think that's a blocker. okay. now that ahf has reviewed it too, I can merge. Thanks, everybody!
Trac:
Keywords: dgoulet-merge deleted, nickm-merge addedMerged appropriate branches to 0.4.1 and master.
Trac:
Status: merge_ready to closed
Resolution: N/A to fixed- Trac closed
closed
- Trac changed time estimate to 1h 36m
changed time estimate to 1h 36m
- Trac added 3h 12m of time spent
added 3h 12m of time spent
- teor mentioned in issue #30958 (moved)
mentioned in issue #30958 (moved)
- teor mentioned in issue #30959 (moved)
mentioned in issue #30959 (moved)
- Trac mentioned in issue #30441 (moved)
mentioned in issue #30441 (moved)
- Trac moved to tpo/core/tor#30956 (closed)
moved to tpo/core/tor#30956 (closed)
- Trac mentioned in issue tpo/core/tor#30958 (closed)
mentioned in issue tpo/core/tor#30958 (closed)
- Trac mentioned in issue tpo/core/tor#30959 (closed)
mentioned in issue tpo/core/tor#30959 (closed)