[or-cvs] r17137: {tor} Patch from rovv: send back END cell in response to connect a (in tor/trunk: . src/or)

[nickm@xxxxxxxx]

Author: nickm
Date: 2008-10-21 12:41:20 -0400 (Tue, 21 Oct 2008)
New Revision: 17137

Modified:
   tor/trunk/ChangeLog
   tor/trunk/src/or/connection_edge.c
Log:
Patch from rovv: send back END cell in response to connect attempts to nonexistent hidden service port.

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2008-10-18 09:17:32 UTC (rev 17136)
+++ tor/trunk/ChangeLog	2008-10-21 16:41:20 UTC (rev 17137)
@@ -28,6 +28,9 @@
     - When we're choosing an exit node for a circuit, and we have
       no pending streams, choose a good general exit rather than one that
       supports "all the pending streams". Bugfix on 0.1.1.x. Fix by rovv.
+    - 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.
 
 
 Changes in version 0.2.1.6-alpha - 2008-09-30

Modified: tor/trunk/src/or/connection_edge.c
===================================================================
--- tor/trunk/src/or/connection_edge.c	2008-10-18 09:17:32 UTC (rev 17136)
+++ tor/trunk/src/or/connection_edge.c	2008-10-21 16:41:20 UTC (rev 17137)
@@ -2566,7 +2566,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;