stop calling channel_mark_client in response to a create_fast

since all it does is produce false positives

this commit should get merged into 0.2.9 and 0.3.0 *and* 0.3.1, even
though the code in the previous commit is already present in 0.3.1. sorry
for the mess.

diff --git a/changes/bug24898-029 b/changes/bug24898-029
index f56dee5c76c2b13c928efa27be8525a16038d4a3..b33f0938415db7da4033fbbe73f7c3725a565fb1 100644 (file)
--- a/changes/bug24898-029
+++ b/changes/bug24898-029
@@ -1,7 +1,6 @@
-  o Minor bugfixes:
+  o Minor bugfixes (relay):
     - Make the internal channel_is_client() function look at what sort
       of connection handshake the other side used, rather than whether
       the other side ever sent a create_fast cell to us. Backports part
-      of the fixes from bug 24898.
-
+      of the fixes from bugs 22805 and 24898.
 

diff --git a/src/or/command.c b/src/or/command.c
index 5866c386e467b51d321ff8ae3c2d00f254bae26e..8831446f0b40fa699451e8c4feddd6e8059d13ed 100644 (file)
--- a/src/or/command.c
+++ b/src/or/command.c
@@ -344,10 +344,6 @@ command_process_create_cell(cell_t *cell, channel_t *chan)
     int len;
     created_cell_t created_cell;
 
-    /* Make sure we never try to use the OR connection on which we
-     * received this cell to satisfy an EXTEND request,  */
-    channel_mark_client(chan);
-
     memset(&created_cell, 0, sizeof(created_cell));
     len = onion_skin_server_handshake(ONION_HANDSHAKE_TYPE_FAST,
                                        create_cell->onionskin,