aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Kadianakis <desnacked@riseup.net>2015-04-02 13:38:52 +0100
committerNick Mathewson <nickm@torproject.org>2015-04-03 09:36:05 -0400
commitbcb839387ef65c0a87ca0a6b7957c3062188c601 (patch)
tree96610ad41194dc27cc40a66578a41a9024b3dc19
parent8dba8a088d7c1402831ab5a7211a4a347a60ff7a (diff)
downloadtor-bcb839387ef65c0a87ca0a6b7957c3062188c601.tar.gz
tor-bcb839387ef65c0a87ca0a6b7957c3062188c601.zip
... and if we do get multiple INTRODUCE1s on a circuit, kill the circuit
(Sending a nak would be pointless.) See ticket 15515 for discussion.
-rw-r--r--src/or/rendmid.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/rendmid.c b/src/or/rendmid.c
index 2f75ffb204..0a005a6312 100644
--- 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;