Preserve reporting of stream end reasons to the local control

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



svn:r17911
This commit is contained in:
Mike Perry 2009-01-05 14:14:57 +00:00
parent b370edcc87
commit da430cfcf7
2 changed files with 4 additions and 1 deletions

View File

@ -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

View File

@ -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;
}