[or-cvs] bugfix: only set conn->hold_open_until_flushed after marking

Roger Dingledine arma at seul.org
Mon Mar 8 01:19:59 UTC 2004


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:
bugfix: only set conn->hold_open_until_flushed after marking


Index: main.c
===================================================================
RCS file: /home/or/cvsroot/src/or/main.c,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -d -r1.194 -r1.195
--- main.c	6 Mar 2004 06:05:00 -0000	1.194
+++ main.c	8 Mar 2004 01:19:57 -0000	1.195
@@ -305,8 +305,8 @@
       log_fn(LOG_INFO,"Expiring connection to %d (%s:%d).",
              i,conn->address, conn->port);
       /* flush anything waiting, e.g. a destroy for a just-expired circ */
-      conn->hold_open_until_flushed = 1;
       connection_mark_for_close(conn,0);
+      conn->hold_open_until_flushed = 1;
     } else {
       /* either a full router, or we've got a circuit. send a padding cell. */
       log_fn(LOG_DEBUG,"Sending keepalive to (%s:%d)",



More information about the tor-commits mailing list