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

fix the bug where we sometimes would fail to send some create cells

Browse Source 
once we'd connected to a(nother) tor server.


svn:r6552
This commit is contained in:
Roger Dingledine 2006-06-06 03:33:24 +00:00
parent 5e4b4451ec
commit 96914760bc
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/or/circuitbuild.c
View File

@ -404,6 +404,7 @@ void
circuit_n_conn_done(connection_t *or_conn, int status)
{
extern smartlist_t *circuits_pending_or_conns;
smartlist_t *changed_circs;
log_debug(LD_CIRC,"or_conn to %s, status=%d",
or_conn->nickname ? or_conn->nickname : "NULL", status);
@ -411,6 +412,8 @@ circuit_n_conn_done(connection_t *or_conn, int status)
if (!circuits_pending_or_conns)
return;
changed_circs = smartlist_create();
SMARTLIST_FOREACH(circuits_pending_or_conns, circuit_t *, circ,
{
if (circ->marked_for_close)
@ -454,18 +457,18 @@ circuit_n_conn_done(connection_t *or_conn, int status)
continue;
}
tor_free(circ->onionskin);
circuit_set_state(circ, CIRCUIT_STATE_OPEN);
/* XXX: Since circuit_set_state removes circ from the
* circuits_pending_or_conns, we will skip over whatever
* the next entry is when we proceed with the SMARTLIST_FOREACH.
* Thus if there's ever more than one entry, we will miss some.
*
* Is this true? If so, is the fix to decrement circ_sl_idx
* here too? -RD
*/
/* We don't want to change circ's state here, since the act
* of doing that modifies the circuits_pending_or_conns list
* that we're looping through right now. So collect a list of
* circs to change their state when we're done. */
smartlist_add(changed_circs, circ);
}
}
});
SMARTLIST_FOREACH(changed_circs, circuit_t *, circ,
circuit_set_state(circ, CIRCUIT_STATE_OPEN));
smartlist_free(changed_circs);
}
/** Find a new circid that isn't currently in use on the circ->n_conn