aboutsummaryrefslogtreecommitdiff
path: root/src/or/relay.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2012-10-03 23:56:34 -0400
committerRoger Dingledine <arma@torproject.org>2012-10-03 23:56:34 -0400
commit10b43f4c46378c5d08aaba01ee00081c18002a44 (patch)
tree063de88bda8c427e6a1c891127364f1deb1c95da /src/or/relay.c
parent05f6f8f26d5911ec33e953f0c21ca56021bfe17d (diff)
downloadtor-10b43f4c46378c5d08aaba01ee00081c18002a44.tar.gz
tor-10b43f4c46378c5d08aaba01ee00081c18002a44.zip
pass the reason from the truncated cell to the controller
(rather than just always declaring that the reason is END_CIRC_REASON_OR_CONN_CLOSED) resolves bug 7039.
Diffstat (limited to 'src/or/relay.c')
-rw-r--r--src/or/relay.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/relay.c b/src/or/relay.c
index 54f66346d9..4a50b710dd 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -1251,7 +1251,8 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ,
"'truncated' unsupported at non-origin. Dropping.");
return 0;
}
- circuit_truncated(TO_ORIGIN_CIRCUIT(circ), layer_hint);
+ circuit_truncated(TO_ORIGIN_CIRCUIT(circ), layer_hint,
+ get_uint8(cell->payload + RELAY_HEADER_SIZE));
return 0;
case RELAY_COMMAND_CONNECTED:
if (conn) {