[or-cvs] bugfix: if the exit stream is pending on the resolve, and a...

[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:
	connection.c 
Log Message:
bugfix: if the exit stream is pending on the resolve, and a destroy
arrives, then the stream wasn't getting removed from the pending list.

this may have been the lucky-bug.
this commit may also not actually fix the bug. it's darn hard to
reproduce.


Index: connection.c
===================================================================
RCS file: /home/or/cvsroot/src/or/connection.c,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -d -r1.150 -r1.151
--- connection.c	24 Feb 2004 22:33:30 -0000	1.150
+++ connection.c	25 Feb 2004 06:57:57 -0000	1.151
@@ -682,6 +682,10 @@
   if(!connection_speaks_cells(conn)) {
      log_fn(LOG_INFO,"CircID %d: At an edge. Marking connection for close.",
             circ_id);
+     if(conn->type == CONN_TYPE_EXIT && conn->state == EXIT_CONN_STATE_RESOLVING) {
+       log_fn(LOG_INFO,"...and informing resolver we don't want the answer anymore.");
+       dns_cancel_pending_resolve(conn->address, conn);
+     }
      if(connection_edge_end(conn, END_STREAM_REASON_DESTROY, conn->cpath_layer) < 0)
        log_fn(LOG_WARN,"1: I called connection_edge_end redundantly.");
      /* if they already sent a destroy, they know. XXX can just close? */