George Kadianakis authored 8 years ago and Nick Mathewson committed 8 years ago

Test for both v2 and v3 ESTABLISH_INTRO handling.

George Kadianakis authored 8 years ago and Nick Mathewson committed 8 years ago

This is needed to make old code unittestable.

George Kadianakis authored 8 years ago and Nick Mathewson committed 8 years ago

(pun not intended)

Now our code supports both legacy and prop224 ESTABLISH_INTRO cells :)

hs_intro_received_establish_intro() is the new entry point.

George Kadianakis authored 8 years ago and Nick Mathewson committed 8 years ago

Currently unused. It will only be used for creating ESTABLISH_INTRO
cells in unittests :)

George Kadianakis authored 8 years ago and Nick Mathewson committed 8 years ago

The new HS circuitmap API replaces old public functions as follows:
   circuit_clear_rend_token -> hs_circuitmap_remove_circuit
   circuit_get_rendezvous -> hs_circuitmap_get_rend_circ
   circuit_get_intro_point -> hs_circuitmap_get_intro_circ_v2
   circuit_set_rendezvous_cookie -> hs_circuitmap_register_rend_circ
   circuit_set_intro_point_digest -> hs_circuitmap_register_intro_circ_v2

This commit also removes the old rendinfo code that is now unused.
It also fixes the broken rendinfo unittests.

George Kadianakis authored 8 years ago and Nick Mathewson committed 8 years ago

The HS circuitmap is a hash table that maps introduction and rendezvous
tokens to specific circuits such that given a token it's easy to find
the corresponding circuit. It supports rend circuits and v2/v3 intro
circuits.

It will be used by the prop224 ESTABLISH_INTRO code to register and
lookup v3 introduction circuits.

The next commit after this removes the old code and fixes the unittests.
Please consult both commits while reviewing functionality differences
between the old and new code. Let me know if you want this rebased
differently :)

WRT architectural differences, this commit removes the rendinfo pointer
from or_circuit_t. It then adds an hs_token_t pointer and a hashtable
node for the HS circuitmap. IIUC, this adds another pointer to the
weight of or_circuit_t. Let me know if you don't like this, or if you
have suggestions on improving it.

George Kadianakis authored 8 years ago and Nick Mathewson committed 8 years ago

This commit only moves code.

Single onion services and Tor2web deliberately create long-term one-hop
circuits to their intro and rend points, respectively.

These log messages are intended to diagnose issue 8387, which relates to
circuits hanging around forever for no reason.

Fixes bug 20613; bugfix on 0.2.9.1-alpha. Reported by "pastly".

Queue a corresponding change for torrc.minimal.in.

Closes ticket 20085.

Refactoring, no behaviour change.

It's not okay to use the same varargs list twice, and apparently
some windows build environments produce code here that would leave
tor_asprintf() broken. Fix for bug 20560; bugfix on 0.2.2.11-alpha
when tor_asprintf() was introduced.

This field indicates if the service is a Single Onion Service if present in
the descriptor.

Closes #19642

Signed-off-by: David Goulet <dgoulet@torproject.org>

This is an "ours" merge to avoid bumping the version.

Lower exponents mean that delays do not vary as much. This helps test
networks bootstrap consistently.

Bugfix on 20499.

This is an "ours" merge to avoid taking the version bump.

Conflicts:
	src/or/rendservice.c