aboutsummaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorMike Perry <mikeperry-git@fscked.org>2009-01-05 14:14:57 +0000
committerMike Perry <mikeperry-git@fscked.org>2009-01-05 14:14:57 +0000
commitda430cfcf73d90949cdc5518ae70035672280a83 (patch)
treea6ff1d248a4d02c807ac5f956ae46f653b680e09 /src/or
parentb370edcc87a07c214e5212518b7b5c46cbed1da6 (diff)
downloadtor-da430cfcf73d90949cdc5518ae70035672280a83.tar.gz
tor-da430cfcf73d90949cdc5518ae70035672280a83.zip
Preserve reporting of stream end reasons to the local control
port. They were lost in the changes for Proposal 148. svn:r17911
Diffstat (limited to 'src/or')
-rw-r--r--src/or/connection_edge.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 52c123c8d5..9c591d4971 100644
--- 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;
}