nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 13:43:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adjust control_reason when adjusting reason (related to 7902)

Browse Source
This commit is contained in:
Nick Mathewson 2013-01-16 12:52:15 -05:00
parent d1b5ae903f
commit e53e6caac5
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/or/relay.c
View File

@ -710,7 +710,7 @@ connection_ap_process_end_not_open(
struct in_addr in; struct in_addr in;
node_t *exitrouter; node_t *exitrouter;
int reason = *(cell->payload+RELAY_HEADER_SIZE); int reason = *(cell->payload+RELAY_HEADER_SIZE);
int control_reason = reason | END_STREAM_REASON_FLAG_REMOTE; int control_reason;
edge_connection_t *edge_conn = ENTRY_TO_EDGE_CONN(conn); edge_connection_t *edge_conn = ENTRY_TO_EDGE_CONN(conn);
(void) layer_hint; /* unused */ (void) layer_hint; /* unused */
@ -738,6 +738,8 @@ connection_ap_process_end_not_open(
reason = END_STREAM_REASON_MISC; reason = END_STREAM_REASON_MISC;
} }
control_reason = reason | END_STREAM_REASON_FLAG_REMOTE;
if (edge_reason_is_retriable(reason) && if (edge_reason_is_retriable(reason) &&
/* avoid retry if rend */ /* avoid retry if rend */
!connection_edge_is_rendezvous_stream(edge_conn)) { !connection_edge_is_rendezvous_stream(edge_conn)) {