[or-cvs] When listing circuits that are pending on an opening OR con...

Roger Dingledine arma at seul.org
Fri Dec 17 23:17:02 UTC 2004


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

Modified Files:
	circuitbuild.c 
Log Message:
When listing circuits that are pending on an opening OR connection,
if we're an OR we were listing circuits that *end* at us as
being pending on every listener, dns/cpu worker, etc. Stop that.


Index: circuitbuild.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/circuitbuild.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- circuitbuild.c	13 Dec 2004 00:44:38 -0000	1.75
+++ circuitbuild.c	17 Dec 2004 23:17:00 -0000	1.76
@@ -216,7 +216,7 @@
                              circ->n_circ_id, circ->p_circ_id);
       }
     }
-    if (!circ->n_conn &&
+    if (!circ->n_conn && circ->n_addr && circ->n_port &&
         circ->n_addr == conn->addr &&
         circ->n_port == conn->port &&
         !memcmp(conn->identity_digest, circ->n_conn_id_digest, DIGEST_LEN)) {



More information about the tor-commits mailing list