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.

svn:r2147

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index f5030f189fce20578483c16110e9aff264a10623..29f948ecec68317bccd9ab2bf4ae4ece9ec3c376 100644 (file)
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -377,6 +377,7 @@ static int connection_ap_handshake_process_socks(connection_t *conn) {
     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 @@ static int connection_ap_handshake_process_socks(connection_t *conn) {
       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;
     }