[or-cvs] fix duplicate dns_cancel_pending_resolve reported by Giorgo...
Roger Dingledine
arma at seul.org
Tue Jan 4 11:26:23 UTC 2005
Update of /home2/or/cvsroot/tor/src/or
In directory moria.mit.edu:/home2/arma/work/onion/cvs/tor/src/or
Modified Files:
dns.c
Log Message:
fix duplicate dns_cancel_pending_resolve reported by Giorgos Pallas
Index: dns.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/dns.c,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- dns.c 4 Jan 2005 06:21:06 -0000 1.129
+++ dns.c 4 Jan 2005 11:26:08 -0000 1.130
@@ -568,7 +568,10 @@
int connection_dns_reached_eof(connection_t *conn) {
log_fn(LOG_WARN,"Read eof. Worker died unexpectedly.");
if (conn->state == DNSWORKER_STATE_BUSY) {
- dns_cancel_pending_resolve(conn->address);
+ /* don't cancel the resolve here -- it would be cancelled in
+ * connection_about_to_close_connection(), since conn is still
+ * in state BUSY
+ */
num_dnsworkers_busy--;
}
num_dnsworkers--;
More information about the tor-commits
mailing list