commit d81f2b5d81814b296e04e1964acf7eed79327970 Author: teor teor2345@gmail.com Date: Mon Oct 31 17:01:33 2016 +1100

Refactor circuit_pick_create_handshake

Make the structure of circuit_pick_create_handshake consistent with circuit_pick_extend_handshake.

No behaviour change. --- src/or/circuitbuild.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 9893215..cb9c146 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -829,11 +829,11 @@ circuit_pick_create_handshake(uint8_t *cell_type_out, if (extend_info_supports_ntor(ei)) { *cell_type_out = CELL_CREATE2; *handshake_type_out = ONION_HANDSHAKE_TYPE_NTOR; - return; + } else { + /* XXXX030 Remove support for deciding to use TAP and EXTEND. */ + *cell_type_out = CELL_CREATE; + *handshake_type_out = ONION_HANDSHAKE_TYPE_TAP; } - - *cell_type_out = CELL_CREATE; - *handshake_type_out = ONION_HANDSHAKE_TYPE_TAP; }

/** Decide whether to use a TAP or ntor handshake for extending to <b>ei</b>