[or-cvs] r10478: Stop tearing down the whole circuit when the user asks for a (in tor/trunk: . src/or)

[arma@xxxxxxxx]

Author: arma
Date: 2007-06-03 23:13:13 -0400 (Sun, 03 Jun 2007)
New Revision: 10478

Modified:
   tor/trunk/ChangeLog
   tor/trunk/src/or/connection_edge.c
Log:
Stop tearing down the whole circuit when the user asks for a
connection to a port that the hidden service didn't configure.
Resolves bug 444.


Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2007-06-04 02:57:23 UTC (rev 10477)
+++ tor/trunk/ChangeLog	2007-06-04 03:13:13 UTC (rev 10478)
@@ -9,7 +9,12 @@
     - Fix a crash when DNSPort is set more than once. (Patch from Robert
       Hogan.)
 
+  o Minor bugfixes (hidden services):
+    - Stop tearing down the whole circuit when the user asks for a
+      connection to a port that the hidden service didn't configure.
+      Resolves bug 444.
 
+
 Changes in version 0.2.0.2-alpha - 2007-06-02
   o Major bugfixes on 0.2.0.1-alpha:
     - Fix an assertion failure related to servers without extra-info digests.

Modified: tor/trunk/src/or/connection_edge.c
===================================================================
--- tor/trunk/src/or/connection_edge.c	2007-06-04 02:57:23 UTC (rev 10477)
+++ tor/trunk/src/or/connection_edge.c	2007-06-04 03:13:13 UTC (rev 10478)
@@ -2235,8 +2235,6 @@
       relay_send_command_from_edge(rh.stream_id, circ, RELAY_COMMAND_END,
                                    end_payload, 1, NULL);
       connection_free(TO_CONN(n_stream));
-      /* knock the whole thing down, somebody screwed up */
-      circuit_mark_for_close(circ, END_CIRC_REASON_CONNECTFAILED);
       tor_free(address);
       return 0;
     }