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

backport from pre3:

Browse Source 
sometimes circuit_get_open_circ_or_launch() can return 0 but not
return a circuit, e.g. because too many circuits have failed recently
so the new one didn't launch. we need to tolerate that.


svn:r2478
This commit is contained in:
Roger Dingledine
2004-10-13 22:02:31 +00:00
parent 7da0c2d705
commit b9c2a71ca1
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
branches/tor-0_0_8-patches/src/or/circuituse.c
+9 -8
View File
@@ -776,6 +776,7 @@ int connection_ap_handshake_attach_circuit(connection_t *conn) {
return retval;
/* We have found a suitable circuit for our conn. Hurray. */
tor_assert(circ);
log_fn(LOG_DEBUG,"Attaching apconn to general circ %d (stream %d sec old).",
circ->n_circ_id, conn_age);
@@ -802,9 +803,9 @@ int connection_ap_handshake_attach_circuit(connection_t *conn) {
retval = circuit_get_open_circ_or_launch(conn, CIRCUIT_PURPOSE_C_REND_JOINED, &rendcirc);
if(retval < 0) return -1; /* failed */
tor_assert(rendcirc);
if(retval > 0) {
tor_assert(rendcirc);
/* one is already established, attach */
log_fn(LOG_INFO,"rend joined circ %d already here. attaching. (stream %d sec old)",
rendcirc->n_circ_id, conn_age);
@@ -814,7 +815,7 @@ int connection_ap_handshake_attach_circuit(connection_t *conn) {
return 1;
}
if(rendcirc->purpose == CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED) {
if(rendcirc && rendcirc->purpose == CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED) {
log_fn(LOG_INFO,"pending-join circ %d already here, with intro ack. Stalling. (stream %d sec old)", rendcirc->n_circ_id, conn_age);
return 0;
}
@@ -822,21 +823,21 @@ int connection_ap_handshake_attach_circuit(connection_t *conn) {
/* it's on its way. find an intro circ. */
retval = circuit_get_open_circ_or_launch(conn, CIRCUIT_PURPOSE_C_INTRODUCE_ACK_WAIT, &introcirc);
if(retval < 0) return -1; /* failed */
tor_assert(introcirc);
if(retval > 0) {
tor_assert(introcirc);
/* one has already sent the intro. keep waiting. */
log_fn(LOG_INFO,"Intro circ %d present and awaiting ack (rend %d). Stalling. (stream %d sec old)",
introcirc->n_circ_id, rendcirc->n_circ_id, conn_age);
introcirc->n_circ_id, rendcirc ? rendcirc->n_circ_id : 0, conn_age);
return 0;
}
/* now both rendcirc and introcirc are defined, and neither is finished */
/* now rendcirc and introcirc are each either undefined or not finished */
if(rendcirc->purpose == CIRCUIT_PURPOSE_C_REND_READY) {
if(rendcirc && introcirc && rendcirc->purpose == CIRCUIT_PURPOSE_C_REND_READY) {
log_fn(LOG_INFO,"ready rend circ %d already here (no intro-ack yet on intro %d). (stream %d sec old)",
rendcirc->n_circ_id, introcirc->n_circ_id, conn_age);
/* look around for any new intro circs that should introduce */
introcirc ? introcirc->n_circ_id : 0,
rendcirc ? rendcirc->n_circ_id : 0, conn_age);
tor_assert(introcirc->purpose == CIRCUIT_PURPOSE_C_INTRODUCING);
if(introcirc->state == CIRCUIT_STATE_OPEN) {