From: teor <teor2345@gmail.com>
Date: Mon, 31 Oct 2016 06:01:33 +0000 (+1100)
Subject: Refactor circuit_pick_create_handshake
X-Git-Tag: tor-0.2.9.5-alpha~20^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d81f2b5d81814b296e04e1964acf7eed79327970;p=thirdparty%2Ftor.git

Refactor circuit_pick_create_handshake

Make the structure of circuit_pick_create_handshake consistent with
circuit_pick_extend_handshake.

No behaviour change.
---

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>