[tor-commits] [tor/release-0.2.2] Correctly send a SUCCEEDED event for rdns requests

arma at torproject.org arma at torproject.org
Thu Jul 7 17:26:57 UTC 2011


commit 3ab09763ced6d892cd72956e53f2dfb804ec0a7c
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Thu Jul 7 05:27:20 2011 +0200

    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!
---
 changes/bug3536          |    5 +++++
 src/or/connection_edge.c |    3 ++-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/changes/bug3536 b/changes/bug3536
new file mode 100644
index 0000000..d3cec13
--- /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 78b1b92..d4d7e1c 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);
 }
 





More information about the tor-commits mailing list