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 | |
| parent | 49f5e5b4aeaededb7729fe38dcf5a1c7745038ee (diff) | |
| download | tor-cda782bac0c9f2107253bfcfc2c3c345ed137db9.tar tor-cda782bac0c9f2107253bfcfc2c3c345ed137db9.tar.gz | |
make rendezvous points work again
(yay. now time to mess them up again.)
svn:r1619
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/connection_edge.c | 2 | ||||
| -rw-r--r-- | src/or/rendclient.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 77422df4b..dc6da9fc0 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -905,7 +905,7 @@ int connection_ap_handshake_attach_circuit(connection_t *conn) { if(retval > 0) { /* one is already established, attach */ - log_fn(LOG_INFO,"rend joined circ already here. reusing."); + log_fn(LOG_INFO,"rend joined circ already here. attaching."); link_apconn_to_circ(conn, rendcirc); if(connection_ap_handshake_send_begin(conn, rendcirc) < 0) return 0; /* already marked, let them fade away */ diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 1beca2247..d0b80a763 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; |