nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

make rendezvous points work again

Browse Source 
(yay. now time to mess them up again.)


svn:r1619
This commit is contained in:
Roger Dingledine 2004-04-14 05:18:21 +00:00
parent 49f5e5b4ae
commit cda782bac0
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/or/connection_edge.c
View File

@ -905,7 +905,7 @@ int connection_ap_handshake_attach_circuit(connection_t *conn) {
if(retval > 0) { if(retval > 0) {
/* one is already established, attach */ /* 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); link_apconn_to_circ(conn, rendcirc);
if(connection_ap_handshake_send_begin(conn, rendcirc) < 0) if(connection_ap_handshake_send_begin(conn, rendcirc) < 0)
return 0; /* already marked, let them fade away */ return 0; /* already marked, let them fade away */

5
src/or/rendclient.c
View File

@ -263,8 +263,9 @@ rend_client_receive_rendezvous(circuit_t *circ, const char *request, int request
crypt_path_t *hop; crypt_path_t *hop;
char keys[DIGEST_LEN+CPATH_KEY_MATERIAL_LEN]; char keys[DIGEST_LEN+CPATH_KEY_MATERIAL_LEN];
if(circ->purpose != CIRCUIT_PURPOSE_C_REND_READY || if( (circ->purpose != CIRCUIT_PURPOSE_C_REND_READY &&
!circ->build_state->pending_final_cpath) { 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."); log_fn(LOG_WARN,"Got rendezvous2 cell from Bob, but not expecting it. Closing.");
circuit_mark_for_close(circ); circuit_mark_for_close(circ);
return -1; return -1;