commit e53e6caac533006245c28657f44e5c929e753336 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jan 16 12:52:15 2013 -0500 Adjust control_reason when adjusting reason (related to 7902) --- src/or/relay.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/or/relay.c b/src/or/relay.c index 2701263..5ac4fbf 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -710,7 +710,7 @@ connection_ap_process_end_not_open( struct in_addr in; node_t *exitrouter; 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); (void) layer_hint; /* unused */ @@ -738,6 +738,8 @@ connection_ap_process_end_not_open( reason = END_STREAM_REASON_MISC; } + control_reason = reason | END_STREAM_REASON_FLAG_REMOTE; + if (edge_reason_is_retriable(reason) && /* avoid retry if rend */ !connection_edge_is_rendezvous_stream(edge_conn)) {