torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

bugfix: tell circuits what id_digest to look for, so

Browse Source 
n_conn_open() can find waiting circuits.


svn:r2034
This commit is contained in:
Roger Dingledine
2004-07-12 23:53:16 +00:00
parent d1fe3c1711
commit 149115cc4e
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/or/circuitbuild.c
+8 -1
View File
@@ -220,6 +220,8 @@ circuit_t *circuit_establish_circuit(uint8_t purpose,
log_fn(LOG_DEBUG,"Looking for firsthop '%s:%u'",
firsthop->address,firsthop->or_port);
/* imprint the circuit with its future n_conn->id */
memcpy(circ->n_conn_id_digest, firsthop->identity_digest, DIGEST_LEN);
n_conn = connection_get_by_identity_digest(firsthop->identity_digest,
CONN_TYPE_OR);
if(!n_conn || n_conn->state != OR_CONN_STATE_OPEN) { /* not currently connected */
@@ -245,7 +247,6 @@ circuit_t *circuit_establish_circuit(uint8_t purpose,
circ->n_addr = n_conn->addr;
circ->n_port = n_conn->port;
circ->n_conn = n_conn;
memcpy(circ->n_conn_id_digest, n_conn->identity_digest, DIGEST_LEN);
log_fn(LOG_DEBUG,"Conn open. Delivering first onion skin.");
if(circuit_send_next_onion_skin(circ) < 0) {
log_fn(LOG_INFO,"circuit_send_next_onion_skin failed.");
@@ -262,6 +263,8 @@ circuit_t *circuit_establish_circuit(uint8_t purpose,
void circuit_n_conn_done(connection_t *or_conn, int success) {
circuit_t *circ;
log_fn(LOG_DEBUG,"or_conn to %s, success=%d", or_conn->nickname, success);
for(circ=global_circuitlist;circ;circ = circ->next) {
if (circ->marked_for_close)
continue;
@@ -492,6 +495,10 @@ int circuit_extend(cell_t *cell, circuit_t *circ) {
memcpy(circ->onionskin, onionskin, ONIONSKIN_CHALLENGE_LEN);
circ->state = CIRCUIT_STATE_OR_WAIT;
/* imprint the circuit with its future n_conn->id */
memcpy(circ->n_conn_id_digest, id_digest, DIGEST_LEN);
n_conn = connection_or_connect(circ->n_addr, circ->n_port, id_digest);
if(!n_conn) {
log_fn(LOG_INFO,"Launching n_conn failed. Closing.");