diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-04-22 20:39:35 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-04-22 20:39:35 -0400 |
| commit | 1ba9b7e0137afc1a4bd6da7dd986ed98999cfbe5 (patch) | |
| tree | 0492733cf6f4af851652059104959c6aa597cc01 /src/or/control.c | |
| parent | 0e8ae82a8757fb8bb2850f1a3d59ad1dfb468556 (diff) | |
| parent | f921fd771ae51a82d971be064edca86b11f6004b (diff) | |
| download | tor-1ba9b7e0137afc1a4bd6da7dd986ed98999cfbe5.tar.gz tor-1ba9b7e0137afc1a4bd6da7dd986ed98999cfbe5.zip | |
Merge remote-tracking branch 'mikeperry/bug25400_squashed'
Diffstat (limited to 'src/or/control.c')
| -rw-r--r-- | src/or/control.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/or/control.c b/src/or/control.c index 050509eccf..6f56313eaa 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -5803,8 +5803,6 @@ control_event_or_conn_status(or_connection_t *conn, or_conn_status_event_t tp, int control_event_stream_bandwidth(edge_connection_t *edge_conn) { - circuit_t *circ; - origin_circuit_t *ocirc; struct timeval now; char tbuf[ISO_TIME_USEC_LEN+1]; if (EVENT_IS_INTERESTING(EVENT_STREAM_BANDWIDTH_USED)) { @@ -5820,12 +5818,6 @@ control_event_stream_bandwidth(edge_connection_t *edge_conn) (unsigned long)edge_conn->n_written, tbuf); - circ = circuit_get_by_edge_conn(edge_conn); - if (circ && CIRCUIT_IS_ORIGIN(circ)) { - ocirc = TO_ORIGIN_CIRCUIT(circ); - ocirc->n_read_circ_bw += edge_conn->n_read; - ocirc->n_written_circ_bw += edge_conn->n_written; - } edge_conn->n_written = edge_conn->n_read = 0; } |