[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] Dont expire circuits we didnt originate. This may be redun...
- To: or-cvs@freehaven.net
- Subject: [or-cvs] Dont expire circuits we didnt originate. This may be redun...
- From: nickm@seul.org (Nick Mathewson)
- Date: Sun, 21 Mar 2004 00:01:09 -0500 (EST)
- Delivered-to: archiver@seul.org
- Delivered-to: or-cvs-outgoing@seul.org
- Delivered-to: or-cvs@seul.org
- Delivery-date: Sun, 21 Mar 2004 00:01:38 -0500
- Reply-to: or-dev@freehaven.net
- Sender: owner-or-cvs@freehaven.net
Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/tmp/cvs-serv11181
Modified Files:
circuit.c
Log Message:
Dont expire circuits we didnt originate. This may be redundant somehow, but better safe than sorry.
Index: circuit.c
===================================================================
RCS file: /home/or/cvsroot/src/or/circuit.c,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -d -r1.156 -r1.157
--- circuit.c 21 Mar 2004 03:03:10 -0000 1.156
+++ circuit.c 21 Mar 2004 05:01:06 -0000 1.157
@@ -926,6 +926,7 @@
if(((tmpcirc->timestamp_dirty &&
tmpcirc->timestamp_dirty + options.NewCircuitPeriod < now) ||
(options.RunTesting &&
+ tmpcirc->cpath &&
tmpcirc->timestamp_created + TESTING_CIRCUIT_MAX_AGE < now))
&& !tmpcirc->p_conn
&& !tmpcirc->p_streams