aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Shepard <andrea@torproject.org>2012-10-01 20:08:36 -0700
committerAndrea Shepard <andrea@torproject.org>2012-10-10 00:44:47 -0700
commit0c4f717b3e83e86fc8646d3803c1e435c6af246d (patch)
treea11e973426b5d4fe593af25d50762be68a88d588
parent8afe41b481caa984fa6b4a0fbbf626d4cd22ce59 (diff)
downloadtor-0c4f717b3e83e86fc8646d3803c1e435c6af246d.tar
tor-0c4f717b3e83e86fc8646d3803c1e435c6af246d.tar.gz
Implement cell_ewma_enabled()
-rw-r--r--src/or/circuitmux_ewma.c8
-rw-r--r--src/or/circuitmux_ewma.h1
2 files changed, 9 insertions, 0 deletions
diff --git a/src/or/circuitmux_ewma.c b/src/or/circuitmux_ewma.c
index 6d4fcc98c..c918d6ff8 100644
--- a/src/or/circuitmux_ewma.c
+++ b/src/or/circuitmux_ewma.c
@@ -520,6 +520,7 @@ cell_ewma_to_circuit(cell_ewma_t *ewma)
*
* These tick values are not meant to be shared between Tor instances, or used
* for other purposes. */
+
static unsigned
cell_ewma_tick_from_timeval(const struct timeval *now,
double *remainder_out)
@@ -532,6 +533,13 @@ cell_ewma_tick_from_timeval(const struct timeval *now,
return res;
}
+/** Tell the caller whether ewma_enabled is set */
+int
+cell_ewma_enabled(void)
+{
+ return ewma_enabled;
+}
+
/** Compute and return the current cell_ewma tick. */
unsigned int
cell_ewma_get_tick(void)
diff --git a/src/or/circuitmux_ewma.h b/src/or/circuitmux_ewma.h
index 0968461c9..eec16f372 100644
--- a/src/or/circuitmux_ewma.h
+++ b/src/or/circuitmux_ewma.h
@@ -20,6 +20,7 @@ extern circuitmux_policy_t ewma_policy;
#endif /* !(_TOR_CIRCUITMUX_EWMA_C) */
/* Externally visible EWMA functions */
+int cell_ewma_enabled(void);
unsigned int cell_ewma_get_tick(void);
void cell_ewma_set_scale_factor(const or_options_t *options,
const networkstatus_t *consensus);