[or-cvs] r16986: {tor} Backport: Commit fix for bug 807 from mwenge: send CLOSED co (in tor/branches/tor-0_2_0-patches: . src/or)

[nickm@xxxxxxxx]

Author: nickm
Date: 2008-09-26 16:26:02 -0400 (Fri, 26 Sep 2008)
New Revision: 16986

Modified:
   tor/branches/tor-0_2_0-patches/ChangeLog
   tor/branches/tor-0_2_0-patches/src/or/connection_edge.c
Log:
Backport: Commit fix for bug 807 from mwenge: send CLOSED controller event for reverse dns resolve, not FAILED.

Modified: tor/branches/tor-0_2_0-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_2_0-patches/ChangeLog	2008-09-26 20:25:35 UTC (rev 16985)
+++ tor/branches/tor-0_2_0-patches/ChangeLog	2008-09-26 20:26:02 UTC (rev 16986)
@@ -17,7 +17,11 @@
       had met our limits precisely. Fixes bug 824. Patch from by rovv.
       Bugfix on 0.2.0.x (??).
 
+  o Minor bugfixes (controller):
+    - Make DNS resolved events into "CLOSED", not "FAILED".  Bugfix on
+      0.1.2.5-alpha.  Fix by Robert Hogan.  Resolves bug 807.
 
+
 Changes in version 0.2.0.31 - 2008-09-03
   Tor 0.2.0.31 addresses two potential anonymity issues, starts to fix
   a big bug we're seeing where in rare cases traffic from one Tor stream

Modified: tor/branches/tor-0_2_0-patches/src/or/connection_edge.c
===================================================================
--- tor/branches/tor-0_2_0-patches/src/or/connection_edge.c	2008-09-26 20:25:35 UTC (rev 16985)
+++ tor/branches/tor-0_2_0-patches/src/or/connection_edge.c	2008-09-26 20:26:02 UTC (rev 16986)
@@ -1368,8 +1368,7 @@
                                              map_expires);
       connection_mark_unattached_ap(conn,
                                 END_STREAM_REASON_DONE |
-                                END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED |
-                                END_STREAM_REASON_FLAG_ALREADY_SENT_CLOSED);
+                                END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED);
       return 0;
     }
     if (options->ClientDNSRejectInternalAddresses) {