aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2006-01-07 02:31:14 +0000
committerRoger Dingledine <arma@torproject.org>2006-01-07 02:31:14 +0000
commit9796733e89072eb26340c258219c38152d243e8e (patch)
tree47e5e0d319dd5f3c64fb7c3de3a4f1bf26bf3bdb
parentd4d7a49411849d0be3f6b42a8ed447a5b2666ce5 (diff)
downloadtor-9796733e89072eb26340c258219c38152d243e8e.tar
tor-9796733e89072eb26340c258219c38152d243e8e.tar.gz
"Pending" is a bad term for a circuit that uses your server as its last hop.
svn:r5751
-rw-r--r--src/or/circuitbuild.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index b81baeedb..0fab50c25 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -256,8 +256,10 @@ circuit_dump_by_conn(connection_t *conn, int severity)
circ->n_addr == conn->addr &&
circ->n_port == conn->port &&
!memcmp(conn->identity_digest, circ->n_conn_id_digest, DIGEST_LEN)) {
- circuit_dump_details(severity, circ, conn->poll_index, "Pending",
-// XXX actually, this could be a circuit that's open and ends here too
+ circuit_dump_details(severity, circ, conn->poll_index,
+ (circ->state == CIRCUIT_STATE_OPEN &&
+ !CIRCUIT_IS_ORIGIN(circ)) ?
+ "Endpoint" : "Pending",
circ->n_circ_id, circ->p_circ_id);
}
}