... and if we do get multiple INTRODUCE1s on a circuit, kill the circuit

(Sending a nak would be pointless.)

See ticket 15515 for discussion.

diff --git a/src/or/rendmid.c b/src/or/rendmid.c
index f85562e0425d2aaa9041337a655407641933bd14..2451acb514198f8c20e2789225d11862f72889a0 100644 (file)
--- a/src/or/rendmid.c
+++ b/src/or/rendmid.c
@@ -157,7 +157,8 @@ rend_mid_introduce(or_circuit_t *circ, const uint8_t *request,
            "Blocking multiple introductions on the same circuit. "
            "Someone might be trying to attack a hidden service through "
            "this relay.");
-    goto err;
+    circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_TORPROTOCOL);
+    return -1;
   }
 
   circ->already_received_introduce1 = 1;