[or-cvs] bugfix: when tor-resolve asks to resolve an IP to an IP and...

[Roger Dingledine]

Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/home2/arma/work/onion/cvs/src/or

Modified Files:
	connection_edge.c 
Log Message:
bugfix: when tor-resolve asks to resolve an IP to an IP and we answer
immediately, there's no need to send an 'end' relay cell when we close
the conn.


Index: connection_edge.c
===================================================================
RCS file: /home/or/cvsroot/src/or/connection_edge.c,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -d -r1.199 -r1.200
--- connection_edge.c	3 Aug 2004 23:57:05 -0000	1.199
+++ connection_edge.c	4 Aug 2004 21:38:00 -0000	1.200
@@ -377,6 +377,7 @@
     if (strlen(socks->address) > RELAY_PAYLOAD_SIZE) {
       connection_ap_handshake_socks_resolved(conn,RESOLVED_TYPE_ERROR,0,NULL);
       conn->socks_request->has_finished = 1;
+      conn->has_sent_end = 1;
       connection_mark_for_close(conn);
       return 0;
     }
@@ -385,6 +386,7 @@
       connection_ap_handshake_socks_resolved(conn,RESOLVED_TYPE_IPV4,4,
                                              (char*)&answer);
       conn->socks_request->has_finished = 1;
+      conn->has_sent_end = 1;
       connection_mark_for_close(conn);
       return 0;
     }