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

[or-cvs] deal with an 0096 "edge connection hasn"t sent end yet" war...

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
	connection.c 
Log Message:
deal with an 0096 "edge connection hasn't sent end yet" warn that
keeps coming up.


Index: connection.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/connection.c,v
retrieving revision 1.310.2.11
retrieving revision 1.310.2.12
diff -u -d -r1.310.2.11 -r1.310.2.12
--- connection.c	25 Mar 2005 05:58:32 -0000	1.310.2.11
+++ connection.c	27 Mar 2005 04:31:04 -0000	1.310.2.12
@@ -1060,6 +1060,9 @@
       /* some sort of error, but maybe just inprogress still */
       if (!ERRNO_IS_CONN_EINPROGRESS(e)) {
         log_fn(LOG_INFO,"in-progress connect failed. Removing.");
+        if (CONN_IS_EDGE(conn))
+          connection_edge_end_errno(conn, conn->cpath_layer);
+
         connection_close_immediate(conn);
         connection_mark_for_close(conn);
         /* it's safe to pass OPs to router_mark_as_down(), since it just