summaryrefslogtreecommitdiff
path: root/src/or/circuit.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2004-04-13 01:41:39 +0000
committerNick Mathewson <nickm@torproject.org>2004-04-13 01:41:39 +0000
commit8483bace6591836d289e55d42f6c2fd94e806aa5 (patch)
tree73f9fa83599123b331d77716eba9866e79b1cf95 /src/or/circuit.c
parent9cd163f6ffdf90bc4e7c26a9e55dc0bd5b8b90b8 (diff)
downloadtor-8483bace6591836d289e55d42f6c2fd94e806aa5.tar.gz
tor-8483bace6591836d289e55d42f6c2fd94e806aa5.zip
Get the rest of intro-ack/nak handling in ... except for the tricky "pick a new intro and re-extend and re-try" part.
svn:r1601
Diffstat (limited to 'src/or/circuit.c')
-rw-r--r--src/or/circuit.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/or/circuit.c b/src/or/circuit.c
index b466e3e4a0..ca9c503aa1 100644
--- a/src/or/circuit.c
+++ b/src/or/circuit.c
@@ -276,6 +276,10 @@ static int circuit_is_acceptable(circuit_t *circ,
circ->purpose != CIRCUIT_PURPOSE_C_REND_READY &&
circ->purpose != CIRCUIT_PURPOSE_C_REND_JOINED)
return 0;
+ } else if (purpose == CIRCUIT_PURPOSE_C_INTRODUCING) {
+ if (circ->purpose != CIRCUIT_PURPOSE_C_INTRODUCING &&
+ circ->purpose != CIRCUIT_PURPOSE_C_INTRODUCE_ACK_WAIT)
+ return 0;
} else {
if(purpose != circ->purpose)
return 0;