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.

Sign up for GitHub

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

Bug21065 035 #2053

Open
wants to merge 2 commits into
base: maint-0.3.5
Choose a base branch
from
Open

Bug21065 035 #2053

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5818fe7
Mark incoming bridge channels as possibly "canonical for peer"
nmathewson Aug 6, 2020
a417889
Only treat canonical-to-peer channels as indicating reachability.
nmathewson Aug 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Only treat canonical-to-peer channels as indicating reachability. 
Previously we'd treat an incoming circuit as indicating orport
reachability, even if it was to an ORPort other than the one we were
trying to test.  Now we only treat it as indicating reachability
when it is on a canonical-to-peer channel: one where the address
matched our published address when the channel was made.

Fixes bug introduced in 4f5192b in 0.1.0.1-rc, back when we
added self-reachability tests. Closes 20165.
  • Loading branch information
@nmathewson
nmathewson committed Aug 6, 2020
commit a417889d919ac6e286ae54116864db0d611349a3
5 changes: 5 additions & 0 deletions changes/bug20165
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
o Minor bugfixes (self-testing):
- Relays now only mark their OR ports as reachable when they get
a circuit on an incoming connection _to the right address_. Previously,
any incoming connection would make the port count as reachable.
Fixes bug 20165; bugfix on 0.1.0.1-rc.
3 changes: 2 additions & 1 deletion src/core/or/circuitbuild.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1514,7 +1514,8 @@ onionskin_answer(or_circuit_t *circ,
* TestingTorNetwork sets ExtendAllowPrivateAddresses. */
if ((!channel_is_local(circ->p_chan)
|| get_options()->ExtendAllowPrivateAddresses)
&& !channel_is_outgoing(circ->p_chan)) {
&& !channel_is_outgoing(circ->p_chan)
&& circ->p_chan->is_canonical_to_peer) {
/* record that we could process create cells from a non-local conn
* that we didn't initiate; presumably this means that create cells
* can reach us too. */
Expand Down