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

Jump to bottom

Bug32588 master #1830

Merged
merged 13 commits into from Mar 23, 2020
Merged

Bug32588 master #1830

merged 13 commits into from Mar 23, 2020

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@teor2345 @torproject-pusher @nmathewson
@teor2345
Copy link
Contributor

@teor2345 teor2345 commented Mar 20, 2020

No description provided.

teor2345 and others added 13 commits Mar 20, 2020
@teor2345
router: Stop advertising incorrect auto IPv6 ORPorts
861337f 
When IPv6 ORPorts are set to "auto", tor relays and bridges would
advertise an incorrect port in their descriptor.

This may be a low-severity memory safety issue, because the published
port number may be derived from uninitialised or out-of-bounds memory
reads.

Fixes bug 32588; bugfix on 0.2.3.9-alpha.
@teor2345
router: Refactor IPv6 ORPort function logic
bac8bc0 
Return early when there is no suitable IPv6 ORPort.
Show the address and port on error, using a convenience function.

Code simplification and refactoring.

Cleanup after 32588.
@nmathewson @teor2345
Add tests for get_first_advertised_{addr,port}_by_type_af()
6ffe073
@nmathewson @teor2345
Add a test for router_get_advertised_or_port_by_af().
1ba79d4
@nmathewson @teor2345
Extend test to handle router_get_advertised_ipv6_or_ap
1251265
@nmathewson @teor2345
Add a test for the localhost case.
96ca14d
@teor2345
Merge branch 'bug32588_035' into bug32588_041
2962c32 
Merge tests from maint-0.4.1 with new tests from bug32588_035
in test_router.c.
@teor2345
Merge branch 'bug32588_041' into bug32588_042
5e2f31f
@teor2345
Merge branch 'bug32588_042' into bug32588_043
52f61ec 
Merge static function declaration deletions from bug32588_042 and
maint-0.4.3 in app/config/config.c.
@teor2345
Merge branch 'bug32588_043' into bug32588_master
4b914de
@teor2345
parseconf: Add ORPort and DirPort auto tests
e0eec3b 
These tests don't actually trigger bug 32588, but they do increase
the coverage of the auto port config code.

Tests for 32588.
@teor2345
Add some comments about future relay IPv6 work
1d22411 
Comments about 33681.
@teor2345
practracker: Accept changes
a34a88c 
Accept a smaller file and function.
Let router.c grow slightly without warning.
Accept an extra comment line.

Cleanup after 32588.
@torproject-pusher torproject-pusher merged commit a34a88c into torproject:master Mar 23, 2020
1 of 2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment