aboutsummaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorGeorge Kadianakis <desnacked@riseup.net>2019-02-25 14:01:55 +0200
committerGeorge Kadianakis <desnacked@riseup.net>2019-02-25 14:01:55 +0200
commit18de065cbbcd9863842fc7f773033f295a0000dc (patch)
treeb9bfe4cdb1f7f2f63f15fc7b775bfe93ed95ab89 /src/core
parent71c11d7306dbbcb81c780a7a786429e2d8eaa669 (diff)
downloadtor-18de065cbbcd9863842fc7f773033f295a0000dc.tar.gz
tor-18de065cbbcd9863842fc7f773033f295a0000dc.zip
Switch an int32_t bin to a circpad_hist_index_t.
Diffstat (limited to 'src/core')
-rw-r--r--src/core/or/circuitpadding.c2
-rw-r--r--src/core/or/circuitpadding.h3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c
index 29a6189309..b7e4b56846 100644
--- a/src/core/or/circuitpadding.c
+++ b/src/core/or/circuitpadding.c
@@ -293,7 +293,7 @@ circpad_histogram_usec_to_bin(const circpad_machine_state_t *mi,
{
const circpad_state_t *state = circpad_machine_current_state(mi);
circpad_delay_t rtt_add_usec = 0;
- int32_t bin;
+ circpad_hist_index_t bin;
/* Our state should have been checked to be non-null by the caller
* (circpad_machine_remove_token()) */
diff --git a/src/core/or/circuitpadding.h b/src/core/or/circuitpadding.h
index ca19e31ca5..74f9f35c98 100644
--- a/src/core/or/circuitpadding.h
+++ b/src/core/or/circuitpadding.h
@@ -235,6 +235,9 @@ typedef uint16_t circpad_statenum_t;
*
* Memory concerns are not so great here since the corresponding histogram and
* histogram_edges arrays are global and not per-circuit.
+ *
+ * If we ever upgrade this to a value that can't be represented by 8-bits we
+ * also need to upgrade circpad_hist_index_t.
*/
#define CIRCPAD_MAX_HISTOGRAM_LEN (100)