[or-cvs] Pending" is a bad term for a circuit that uses your server ...

[arma at seul.org]

Update of /home2/or/cvsroot/tor/src/or
In directory moria:/home/arma/work/onion/cvs/tor/src/or

Modified Files:
	circuitbuild.c 
Log Message:
"Pending" is a bad term for a circuit that uses your server as its last hop.


Index: circuitbuild.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/circuitbuild.c,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -p -d -r1.202 -r1.203
--- circuitbuild.c	7 Jan 2006 00:41:50 -0000	1.202
+++ circuitbuild.c	7 Jan 2006 02:31:14 -0000	1.203
@@ -256,8 +256,10 @@ circuit_dump_by_conn(connection_t *conn,
         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);
     }
   }