[or-cvs] r17911: {tor} Preserve reporting of stream end reasons to the local contro (in tor/trunk: . src/or)

[mikeperry at seul.org]

Author: mikeperry
Date: 2009-01-05 09:14:57 -0500 (Mon, 05 Jan 2009)
New Revision: 17911

Modified:
   tor/trunk/ChangeLog
   tor/trunk/src/or/connection_edge.c
Log:

Preserve reporting of stream end reasons to the local control
port.  They were lost in the changes for Proposal 148.



Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2009-01-05 13:54:47 UTC (rev 17910)
+++ tor/trunk/ChangeLog	2009-01-05 14:14:57 UTC (rev 17911)
@@ -33,6 +33,8 @@
       document.  Bugfix on 0.2.0.7-alpha.
     - Do not accept incomplete ipv4 addresses (like 192.168.0) as valid.
       Spec conformance issue.  Bugfix on Tor 0.0.2pre27.
+    - Preserve reporting of stream end reasons to the local control port.
+      They were lost in the changes for Proposal 148.
 
   o Deprecated and removed features:
     - The old "tor --version --version" command, which would spit out the

Modified: tor/trunk/src/or/connection_edge.c
===================================================================
--- tor/trunk/src/or/connection_edge.c	2009-01-05 13:54:47 UTC (rev 17910)
+++ tor/trunk/src/or/connection_edge.c	2009-01-05 14:14:57 UTC (rev 17911)
@@ -212,6 +212,7 @@
   char payload[RELAY_PAYLOAD_SIZE];
   size_t payload_len=1;
   circuit_t *circ;
+  uint8_t control_reason = reason;
 
   if (conn->edge_has_sent_end) {
     log_warn(LD_BUG,"(Harmless.) Calling connection_edge_end (reason %d) "
@@ -260,7 +261,7 @@
   }
 
   conn->edge_has_sent_end = 1;
-  conn->end_reason = reason;
+  conn->end_reason = control_reason;
   return 0;
 }