aboutsummaryrefslogtreecommitdiff
path: root/src/or/or.h
diff options
context:
space:
mode:
authorKarsten Loesing <karsten.loesing@gmx.net>2013-05-25 13:04:33 +0200
committerKarsten Loesing <karsten.loesing@gmx.net>2013-05-25 19:51:38 +0200
commitb33b366a7f8bcab1c9b4859788e3b2c7d3dcf180 (patch)
tree59c39ba18a4ff251e0577d2d073548b9ab8f45b6 /src/or/or.h
parentef67077fba6061a6e5b9a76caf60a33d17a81ce6 (diff)
downloadtor-b33b366a7f8bcab1c9b4859788e3b2c7d3dcf180.tar
tor-b33b366a7f8bcab1c9b4859788e3b2c7d3dcf180.tar.gz
Tweak CIRC_BW event based on comments by nickm.
- Rename n_read and n_written in origin_circuit_t to make it clear that these are only used for CIRC_BW events. - Extract new code in control_update_global_event_mask to new clear_circ_bw_fields function.
Diffstat (limited to 'src/or/or.h')
-rw-r--r--src/or/or.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/or/or.h b/src/or/or.h
index 21a36c928..6dd3ce449 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -2971,12 +2971,14 @@ typedef struct origin_circuit_t {
edge_connection_t *p_streams;
/** Bytes read from any attached stream since last call to
- * control_event_circ_bandwidth_used() */
- uint32_t n_read;
+ * control_event_circ_bandwidth_used(). Only used if we're configured
+ * to emit CIRC_BW events. */
+ uint32_t n_read_circ_bw;
/** Bytes written to any attached stream since last call to
- * control_event_circ_bandwidth_used() */
- uint32_t n_written;
+ * control_event_circ_bandwidth_used(). Only used if we're configured
+ * to emit CIRC_BW events. */
+ uint32_t n_written_circ_bw;
/** Build state for this circuit. It includes the intended path
* length, the chosen exit router, rendezvous information, etc.