Preserve reporting of stream end reasons to the local control

port.  They were lost in the changes for Proposal 148.

svn:r17911

diff --git a/ChangeLog b/ChangeLog
index d4b808155535595f3719370921cd49691ba5407c..15368555462a21ab85c648f52f56934dfa7d2450 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,6 +33,8 @@ Changes in version 0.2.1.10-alpha - 2009-01-??
       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

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 52c123c8d5070315cf15e16b702e4b25259011cc..9c591d4971eea59cdd8c7a057fa49d37eecd9a60 100644 (file)
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -212,6 +212,7 @@ connection_edge_end(edge_connection_t *conn, uint8_t reason)
   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 @@ connection_edge_end(edge_connection_t *conn, uint8_t reason)
   }
 
   conn->edge_has_sent_end = 1;
-  conn->end_reason = reason;
+  conn->end_reason = control_reason;
   return 0;
 }