nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-03 17:13:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Must detach before attaching, or else we infinite-loop

Browse Source 
svn:r1632
This commit is contained in:
Nick Mathewson 2004-04-15 03:48:26 +00:00
parent ddc11899b6
commit 880ffd8f64
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/or/connection_edge.c
View File

@ -232,6 +232,7 @@ int connection_edge_process_relay_cell_not_open(
addr = ntohl(get_uint32(cell->payload+RELAY_HEADER_SIZE+1)); addr = ntohl(get_uint32(cell->payload+RELAY_HEADER_SIZE+1));
client_dns_set_entry(conn->socks_request->address, addr); client_dns_set_entry(conn->socks_request->address, addr);
conn->state = AP_CONN_STATE_CIRCUIT_WAIT; conn->state = AP_CONN_STATE_CIRCUIT_WAIT;
circuit_detach_stream(circ,conn);
if(connection_ap_handshake_attach_circuit(conn) >= 0) if(connection_ap_handshake_attach_circuit(conn) >= 0)
return 0; return 0;
/* else, conn will get closed below */ /* else, conn will get closed below */
@ -240,6 +241,7 @@ int connection_edge_process_relay_cell_not_open(
< MAX_RESOLVE_FAILURES) { < MAX_RESOLVE_FAILURES) {
/* We haven't retried too many times; reattach the connection. */ /* We haven't retried too many times; reattach the connection. */
conn->state = AP_CONN_STATE_CIRCUIT_WAIT; conn->state = AP_CONN_STATE_CIRCUIT_WAIT;
circuit_detach_stream(circ,conn);
if(connection_ap_handshake_attach_circuit(conn) >= 0) if(connection_ap_handshake_attach_circuit(conn) >= 0)
return 0; return 0;
/* else, conn will get closed below */ /* else, conn will get closed below */
@ -256,7 +258,6 @@ int connection_edge_process_relay_cell_not_open(
return 0; return 0;
} }
if(conn->type == CONN_TYPE_AP && rh->command == RELAY_COMMAND_CONNECTED) { if(conn->type == CONN_TYPE_AP && rh->command == RELAY_COMMAND_CONNECTED) {
if(conn->state != AP_CONN_STATE_CONNECT_WAIT) { if(conn->state != AP_CONN_STATE_CONNECT_WAIT) {
log_fn(LOG_WARN,"Got 'connected' while not in state connect_wait. Dropping."); log_fn(LOG_WARN,"Got 'connected' while not in state connect_wait. Dropping.");