[or-cvs] temporarily stop one of those obnoxious warns

Roger Dingledine arma at seul.org
Fri Feb 4 03:05:15 UTC 2005


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
	dns.c 
Log Message:
temporarily stop one of those obnoxious warns


Index: dns.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/dns.c,v
retrieving revision 1.126.2.7
retrieving revision 1.126.2.8
diff -u -d -r1.126.2.7 -r1.126.2.8
--- dns.c	4 Feb 2005 01:46:54 -0000	1.126.2.7
+++ dns.c	4 Feb 2005 03:05:12 -0000	1.126.2.8
@@ -518,7 +518,8 @@
       /* prevent double-remove. */
       pendconn->state = EXIT_CONN_STATE_RESOLVEFAILED;
       if (pendconn->purpose == EXIT_PURPOSE_CONNECT) {
-        connection_edge_end(pendconn, END_STREAM_REASON_RESOLVEFAILED, pendconn->cpath_layer);
+        if (!pendconn->has_sent_end) /* XXX prevent warn, but not fix bug */
+          connection_edge_end(pendconn, END_STREAM_REASON_RESOLVEFAILED, pendconn->cpath_layer);
         /* This detach must happen after we send the end cell. */
         circuit_detach_stream(circuit_get_by_conn(pendconn), pendconn);
       } else {



More information about the tor-commits mailing list