diff options
| author | teor <teor2345@gmail.com> | 2016-10-31 17:01:33 +1100 |
|---|---|---|
| committer | teor <teor2345@gmail.com> | 2016-10-31 17:01:33 +1100 |
| commit | d81f2b5d81814b296e04e1964acf7eed79327970 (patch) | |
| tree | 4f214fc2d557bf5c06dc061278017680541ee468 /src/or/circuitbuild.c | |
| parent | 26d7a07ad773713403a0db1c49ccb58e071763b2 (diff) | |
| download | tor-d81f2b5d81814b296e04e1964acf7eed79327970.tar.gz tor-d81f2b5d81814b296e04e1964acf7eed79327970.zip | |
Refactor circuit_pick_create_handshake
Make the structure of circuit_pick_create_handshake consistent with
circuit_pick_extend_handshake.
No behaviour change.
Diffstat (limited to 'src/or/circuitbuild.c')
| -rw-r--r-- | src/or/circuitbuild.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 9893215866..cb9c146fb7 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> |