[or-cvs] r17868: {tor} Backport r17137: Patch from rovv: send back END cell in resp (in tor/branches/tor-0_2_0-patches: . doc src/or)

[nickm at seul.org]

Author: nickm
Date: 2009-01-03 22:03:40 -0500 (Sat, 03 Jan 2009)
New Revision: 17868

Modified:
   tor/branches/tor-0_2_0-patches/ChangeLog
   tor/branches/tor-0_2_0-patches/doc/TODO.020
   tor/branches/tor-0_2_0-patches/src/or/connection_edge.c
Log:
Backport r17137: Patch from rovv: send back END cell in response to connect attempts to nonexistent hidden service port.

Modified: tor/branches/tor-0_2_0-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_2_0-patches/ChangeLog	2009-01-04 00:35:51 UTC (rev 17867)
+++ tor/branches/tor-0_2_0-patches/ChangeLog	2009-01-04 03:03:40 UTC (rev 17868)
@@ -49,6 +49,9 @@
     - Fix a race condition when freeing keys shared between main thread
       and CPU workers that could result in a memory leak.  Bugfix on
       0.1.0.1-rc.  Fixes bug 889.
+    - Send a valid END cell back when a client tries to connect to a
+      nonexistent hidden service port.  Bugfix on 0.1.2.15.  Fixes bug
+      840.  Patch from rovv.
 
   o Minor features:
     - Report the case where all signatures in a detached set are rejected

Modified: tor/branches/tor-0_2_0-patches/doc/TODO.020
===================================================================
--- tor/branches/tor-0_2_0-patches/doc/TODO.020	2009-01-04 00:35:51 UTC (rev 17867)
+++ tor/branches/tor-0_2_0-patches/doc/TODO.020	2009-01-04 03:03:40 UTC (rev 17868)
@@ -16,7 +16,7 @@
             "no circuits are pending."
     o See also r17181...
     o ... and r17184.
-  - r17137: send END cell in response to connect to nonexistent hidserv port.
+  o r17137: send END cell in response to connect to nonexistent hidserv port.
   - r17138: reject *:* servers should never do DNS lookups.
   o r17139: Fix another case of overriding .exit choices.
   - r17162 and r17164: fix another case of not checking cpath_layer.

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	2009-01-04 00:35:51 UTC (rev 17867)
+++ tor/branches/tor-0_2_0-patches/src/or/connection_edge.c	2009-01-04 03:03:40 UTC (rev 17868)
@@ -2497,7 +2497,7 @@
                n_stream->_base.port);
       end_payload[0] = END_STREAM_REASON_EXITPOLICY;
       relay_send_command_from_edge(rh.stream_id, circ, RELAY_COMMAND_END,
-                                   end_payload, 1, NULL);
+                                   end_payload, 1, origin_circ->cpath->prev);
       connection_free(TO_CONN(n_stream));
       tor_free(address);
       return 0;