[or-cvs] Cosmetic patch for arma"s fix for The Bug: Don"t set the st...

[nickm@seul.org (Nick Mathewson)]

Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/tmp/cvs-serv30250/src/or

Modified Files:
	dns.c 
Log Message:
Cosmetic patch for arma's fix for The Bug: Don't set the state to
RESOLVEFAILED if the resolve didn't fail; set it to CONNECTING
instead.


Index: dns.c
===================================================================
RCS file: /home/or/cvsroot/src/or/dns.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- dns.c	9 Apr 2004 21:31:09 -0000	1.76
+++ dns.c	11 Apr 2004 17:07:45 -0000	1.77
@@ -378,14 +378,16 @@
     assert_connection_ok(pend->conn,time(NULL));
     pend->conn->addr = resolve->addr;
 
-    /* prevent double-remove. (this may get changed below.) */
-    pend->conn->state = EXIT_CONN_STATE_RESOLVEFAILED;
 
     if(resolve->state == CACHE_STATE_FAILED) {
       pendconn = pend->conn; /* don't pass complex things to the
                                 connection_mark_for_close macro */
+      /* prevent double-remove. */
+      pend->conn->state = EXIT_CONN_STATE_RESOLVEFAILED;
       connection_mark_for_close(pendconn, END_STREAM_REASON_RESOLVEFAILED);
     } else {
+      /* prevent double-remove. */
+      pend->conn->state = EXIT_CONN_STATE_CONNECTING;
       connection_exit_connect(pend->conn);
     }
     resolve->pending_connections = pend->next;