Fix issues from dgoulet's code review.

https://gitlab.com/dgoulet/tor/merge_requests/24

1 files changed, 10 insertions, 19 deletions

diff --git a/src/or/command.c b/src/or/command.c
index cebb5bfc7a..5f3b667ad9 100644
--- a/src/or/command.c
+++ b/src/or/command.c
@@ -326,17 +326,18 @@ command_process_create_cell(cell_t *cell, channel_t *chan)
     return;
   }
 
+  if (connection_or_digest_is_known_relay(chan->identity_digest)) {
+    rep_hist_note_circuit_handshake_requested(create_cell->handshake_type);
+    // Needed for chutney: Sometimes relays aren't in the consensus yet, and
+    // get marked as clients. This resets their channels once they appear.
+    // Probably useful for normal operation wrt relay flapping, too.
+    chan->is_client = 0;
+  } else {
+    channel_mark_client(chan);
+  }
+
   if (create_cell->handshake_type != ONION_HANDSHAKE_TYPE_FAST) {
     /* hand it off to the cpuworkers, and then return. */
-    if (connection_or_digest_is_known_relay(chan->identity_digest)) {
-      rep_hist_note_circuit_handshake_requested(create_cell->handshake_type);
-      // Needed for chutney: Sometimes relays aren't in the consensus yet, and
-      // get marked as clients. This resets their channels once they appear.
-      // Probably useful for normal operation wrt relay flapping, too.
-      chan->is_client = 0;
-    } else {
-      channel_mark_client(chan);
-    }
 
     if (assign_onionskin_to_cpuworker(circ, create_cell) < 0) {
       log_debug(LD_GENERAL,"Failed to hand off onionskin. Closing.");
@@ -352,16 +353,6 @@ command_process_create_cell(cell_t *cell, channel_t *chan)
     int len;
     created_cell_t created_cell;
 
-    /* If this is a create_fast, this might be a client. Let's check. */
-    if (connection_or_digest_is_known_relay(chan->identity_digest)) {
-      // Needed for chutney: Sometimes relays aren't in the consensus yet, and
-      // get marked as clients. This resets their channels once they appear.
-      // Probably useful for normal operation wrt relay flapping, too.
-      chan->is_client = 0;
-    } else {
-      channel_mark_client(chan);
-    }
-
     memset(&created_cell, 0, sizeof(created_cell));
     len = onion_skin_server_handshake(ONION_HANDSHAKE_TYPE_FAST,
                                        create_cell->onionskin,