[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[or-cvs] backport: make kill -USR1 more accurate on servers when lis...

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

Modified Files:
      Tag: tor-0_0_9-patches
	circuitbuild.c 
Log Message:
backport: make kill -USR1 more accurate on servers when listing circuits


Index: circuitbuild.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/circuitbuild.c,v
retrieving revision 1.75
retrieving revision 1.75.2.1
diff -u -d -r1.75 -r1.75.2.1
--- circuitbuild.c	13 Dec 2004 00:44:38 -0000	1.75
+++ circuitbuild.c	22 Dec 2004 08:38:47 -0000	1.75.2.1
@@ -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)) {