aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Hahn <sebastian@torproject.org>2011-07-07 05:27:20 +0200
committerSebastian Hahn <sebastian@torproject.org>2011-07-07 05:38:38 +0200
commit3ab09763ced6d892cd72956e53f2dfb804ec0a7c (patch)
treedebfc504fc02b1f279ee39794a151043515fd31d
parent1a016c923348c125d79d2e92c2ae9fa2fa2a5af8 (diff)
downloadtor-3ab09763ced6d892cd72956e53f2dfb804ec0a7c.tar
tor-3ab09763ced6d892cd72956e53f2dfb804ec0a7c.tar.gz
Correctly send a SUCCEEDED event for rdns requests
The issue was that we overlooked the possibility of reverse DNS success at the end of connection_ap_handshake_socks_resolved(). Issue discovered by katmagic, thanks!
-rw-r--r--changes/bug35365
-rw-r--r--src/or/connection_edge.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/changes/bug3536 b/changes/bug3536
new file mode 100644
index 000000000..d3cec131b
--- /dev/null
+++ b/changes/bug3536
@@ -0,0 +1,5 @@
+ o Minor bugfixes:
+ - Send a SUCCEEDED stream event to the controller when a reverse
+ resolve succeeded. Fixes bug 3536; bugfix on 0.0.8pre1. Issue
+ discovered by katmagic.
+
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 78b1b92de..d4d7e1c73 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -2611,7 +2611,8 @@ connection_ap_handshake_socks_resolved(edge_connection_t *conn,
}
connection_ap_handshake_socks_reply(conn, buf, replylen,
(answer_type == RESOLVED_TYPE_IPV4 ||
- answer_type == RESOLVED_TYPE_IPV6) ?
+ answer_type == RESOLVED_TYPE_IPV6 ||
+ answer_type == RESOLVED_TYPE_HOSTNAME) ?
0 : END_STREAM_REASON_RESOLVEFAILED);
}