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

log n_circ_ids when attaching rend streams

Browse Source 
svn:r1657
This commit is contained in:
Roger Dingledine 2004-04-17 10:25:38 +00:00
parent 26dd5c68b0
commit 65d507b980
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/or/circuit.c
View File

@ -474,13 +474,15 @@ void circuit_expire_building(time_t now) {
if(victim->purpose >= CIRCUIT_PURPOSE_C_INTRODUCING && if(victim->purpose >= CIRCUIT_PURPOSE_C_INTRODUCING &&
victim->purpose <= CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED) { victim->purpose <= CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED) {
if(!victim->timestamp_dirty) if(!victim->timestamp_dirty)
log_fn(LOG_DEBUG,"Considering %sopen purp %d to %s (clean).", log_fn(LOG_DEBUG,"Considering %sopen purp %d to %s (circid %d). (clean).",
victim->state == CIRCUIT_STATE_OPEN ? "" : "non",
victim->purpose, victim->build_state->chosen_exit);
else
log_fn(LOG_DEBUG,"Considering %sopen purp %d to %s. %d secs since dirty.",
victim->state == CIRCUIT_STATE_OPEN ? "" : "non", victim->state == CIRCUIT_STATE_OPEN ? "" : "non",
victim->purpose, victim->build_state->chosen_exit, victim->purpose, victim->build_state->chosen_exit,
victim->n_circ_id);
else
log_fn(LOG_DEBUG,"Considering %sopen purp %d to %s (circid %d). %d secs since dirty.",
victim->state == CIRCUIT_STATE_OPEN ? "" : "non",
victim->purpose, victim->build_state->chosen_exit,
victim->n_circ_id,
(int)(now - victim->timestamp_dirty)); (int)(now - victim->timestamp_dirty));
} }

21
src/or/connection_edge.c
View File

@ -876,7 +876,7 @@ int connection_ap_handshake_attach_circuit(connection_t *conn) {
conn_age = time(NULL) - conn->timestamp_created; conn_age = time(NULL) - conn->timestamp_created;
if(conn_age > 60) { if(conn_age > 60) {
/* XXX make this cleaner than '60' */ /* XXX make this cleaner than '60' */
log_fn(LOG_WARN,"Giving up on attached circ (%d sec old).", conn_age); log_fn(LOG_WARN,"Giving up on unattached conn (%d sec old).", conn_age);
connection_mark_for_close(conn, 0); connection_mark_for_close(conn, 0);
} }
@ -890,7 +890,8 @@ int connection_ap_handshake_attach_circuit(connection_t *conn) {
/* We have found a suitable circuit for our conn. Hurray. */ /* We have found a suitable circuit for our conn. Hurray. */
log_fn(LOG_DEBUG,"Attaching apconn to general circ (%d sec old).", conn_age); log_fn(LOG_DEBUG,"Attaching apconn to general circ %d (stream %d sec old).",
circ->n_circ_id, conn_age);
/* here, print the circ's path. so people can figure out which circs are sucking. */ /* here, print the circ's path. so people can figure out which circs are sucking. */
circuit_log_path(LOG_INFO,circ); circuit_log_path(LOG_INFO,circ);
@ -915,7 +916,8 @@ 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. attaching. (%d sec old)", conn_age); log_fn(LOG_INFO,"rend joined circ %d already here. attaching. (stream %d sec old)",
rendcirc->n_circ_id, conn_age);
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 */
@ -923,7 +925,7 @@ int connection_ap_handshake_attach_circuit(connection_t *conn) {
} }
if(rendcirc->purpose == CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED) { if(rendcirc->purpose == CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED) {
log_fn(LOG_INFO,"pending-join circ already here, with intro ack. Stalling. (%d sec old)", conn_age); 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; return 0;
} }
@ -934,19 +936,22 @@ int connection_ap_handshake_attach_circuit(connection_t *conn) {
if(retval > 0) { if(retval > 0) {
/* one has already sent the intro. keep waiting. */ /* one has already sent the intro. keep waiting. */
log_fn(LOG_INFO,"Intro circ present and awaiting ack. Stalling. (%d sec old)", conn_age); 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);
return 0; return 0;
} }
/* now both rendcirc and introcirc are defined, and neither is finished */ /* now both rendcirc and introcirc are defined, and neither is finished */
if(rendcirc->purpose == CIRCUIT_PURPOSE_C_REND_READY) { if(rendcirc->purpose == CIRCUIT_PURPOSE_C_REND_READY) {
log_fn(LOG_INFO,"ready rend circ already here (no intro-ack yet). (%d sec old)", conn_age); 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 */ /* look around for any new intro circs that should introduce */
assert(introcirc->purpose == CIRCUIT_PURPOSE_C_INTRODUCING); assert(introcirc->purpose == CIRCUIT_PURPOSE_C_INTRODUCING);
if(introcirc->state == CIRCUIT_STATE_OPEN) { if(introcirc->state == CIRCUIT_STATE_OPEN) {
log_fn(LOG_INFO,"found open intro circ; sending introduction. (%d sec old)", conn_age); log_fn(LOG_INFO,"found open intro circ %d (rend %d); sending introduction. (stream %d sec old)",
introcirc->n_circ_id, rendcirc->n_circ_id, conn_age);
/* XXX here we should cannibalize the rend circ if it's a zero service id */ /* XXX here we should cannibalize the rend circ if it's a zero service id */
if(rend_client_send_introduction(introcirc, rendcirc) < 0) { if(rend_client_send_introduction(introcirc, rendcirc) < 0) {
return -1; return -1;
@ -959,7 +964,7 @@ int connection_ap_handshake_attach_circuit(connection_t *conn) {
} }
} }
log_fn(LOG_INFO,"Intro and rend circs are not both ready. Stalling conn. (%d sec old)", conn_age); log_fn(LOG_INFO,"Intro (%d) and rend (%d) circs are not both ready. Stalling conn. (%d sec old)", introcirc->n_circ_id, rendcirc->n_circ_id, conn_age);
return 0; return 0;
} }
} }