diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-12-19 10:35:47 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-12-19 10:35:47 -0500 |
| commit | 64787e99faa794463e2e9a162340aa457018d321 (patch) | |
| tree | 964dbc206995595ffd807a8644209d823e261689 /src/or/rendmid.c | |
| parent | eee248bc593ab57cd905195458dd2b64c94e9ac1 (diff) | |
| parent | 13a6fb9a2aa499e160e2b7d71794d6f5614bbd19 (diff) | |
| download | tor-64787e99faa794463e2e9a162340aa457018d321.tar.gz tor-64787e99faa794463e2e9a162340aa457018d321.zip | |
Merge branch 'asn-karsten-task-13192-5-squashed'
Diffstat (limited to 'src/or/rendmid.c')
| -rw-r--r-- | src/or/rendmid.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/or/rendmid.c b/src/or/rendmid.c index 6a701e7a77..1c56471b8c 100644 --- a/src/or/rendmid.c +++ b/src/or/rendmid.c @@ -281,6 +281,7 @@ int rend_mid_rendezvous(or_circuit_t *circ, const uint8_t *request, size_t request_len) { + const or_options_t *options = get_options(); or_circuit_t *rend_circ; char hexid[9]; int reason = END_CIRC_REASON_INTERNAL; @@ -316,6 +317,12 @@ rend_mid_rendezvous(or_circuit_t *circ, const uint8_t *request, goto err; } + /* Statistics: Mark this circuit as an RP circuit so that we collect + stats from it. */ + if (options->HiddenServiceStatistics) { + circ->circuit_carries_hs_traffic_stats = 1; + } + /* Send the RENDEZVOUS2 cell to Alice. */ if (relay_send_command_from_edge(0, TO_CIRCUIT(rend_circ), RELAY_COMMAND_RENDEZVOUS2, |