aboutsummaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2004-08-04 21:38:00 +0000
committerRoger Dingledine <arma@torproject.org>2004-08-04 21:38:00 +0000
commit54dd90d39157f64648db65a40ef498369da21801 (patch)
treef0b15c310071f75945d5a5f0cbcf26aaad58ad5a /src/or
parent6a022bdcdc7416bde405df1cab5cb399d1546227 (diff)
downloadtor-54dd90d39157f64648db65a40ef498369da21801.tar
tor-54dd90d39157f64648db65a40ef498369da21801.tar.gz
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
Diffstat (limited to 'src/or')
-rw-r--r--src/or/connection_edge.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index f5030f189..29f948ece 100644
--- 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;
}