[or-cvs] only expire wedged dir conns that haven"t already been expi...

[arma@seul.org (Roger Dingledine)]

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

Modified Files:
	main.c 
Log Message:
only expire wedged dir conns that haven't already been expired


Index: main.c
===================================================================
RCS file: /home/or/cvsroot/src/or/main.c,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -d -r1.245 -r1.246
--- main.c	19 Apr 2004 20:08:42 -0000	1.245
+++ main.c	20 Apr 2004 17:27:54 -0000	1.246
@@ -307,6 +307,7 @@
   connection_t *conn = connection_array[i];
 
   if(conn->type == CONN_TYPE_DIR &&
+     !conn->marked_for_close &&
      conn->timestamp_lastwritten + 5*60 < now) {
     log_fn(LOG_WARN,"Expiring wedged directory conn (purpose %d)", conn->purpose);
     connection_mark_for_close(conn,0);