diff options
| author | Roger Dingledine <arma@torproject.org> | 2004-04-14 05:18:21 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2004-04-14 05:18:21 +0000 |
| commit | cda782bac0c9f2107253bfcfc2c3c345ed137db9 (patch) | |
| tree | 4fa3420c9b3cc2636a21159c395d4a482fbc1c47 /src/or/rendclient.c | |
| parent | 49f5e5b4aeaededb7729fe38dcf5a1c7745038ee (diff) | |
| download | tor-cda782bac0c9f2107253bfcfc2c3c345ed137db9.tar.gz tor-cda782bac0c9f2107253bfcfc2c3c345ed137db9.zip | |
make rendezvous points work again
(yay. now time to mess them up again.)
svn:r1619
Diffstat (limited to 'src/or/rendclient.c')
| -rw-r--r-- | src/or/rendclient.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 1beca22476..d0b80a7631 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -263,8 +263,9 @@ rend_client_receive_rendezvous(circuit_t *circ, const char *request, int request crypt_path_t *hop; char keys[DIGEST_LEN+CPATH_KEY_MATERIAL_LEN]; - if(circ->purpose != CIRCUIT_PURPOSE_C_REND_READY || - !circ->build_state->pending_final_cpath) { + if( (circ->purpose != CIRCUIT_PURPOSE_C_REND_READY && + circ->purpose != CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED) + || !circ->build_state->pending_final_cpath) { log_fn(LOG_WARN,"Got rendezvous2 cell from Bob, but not expecting it. Closing."); circuit_mark_for_close(circ); return -1; |