summaryrefslogtreecommitdiff
path: root/src/or/circuitlist.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-12-08 17:50:34 -0500
committerNick Mathewson <nickm@torproject.org>2017-12-08 17:50:34 -0500
commit0340c02975a51410525507b92ee0b7f9e6e9d6f7 (patch)
treec05b52d44266d002ac2b9192c16b3d11f941300e /src/or/circuitlist.h
parentb189c613bb27695753761d0851c17f521e8f00de (diff)
parent050bb67974c11e0f390f4b1fa1b067c86538c59e (diff)
downloadtor-0340c02975a51410525507b92ee0b7f9e6e9d6f7.tar.gz
tor-0340c02975a51410525507b92ee0b7f9e6e9d6f7.zip
Merge remote-tracking branch 'mikeperry/bug23114_squashed2'
Diffstat (limited to 'src/or/circuitlist.h')
-rw-r--r--src/or/circuitlist.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/or/circuitlist.h b/src/or/circuitlist.h
index bf3393a941..8868646d59 100644
--- a/src/or/circuitlist.h
+++ b/src/or/circuitlist.h
@@ -17,6 +17,10 @@
MOCK_DECL(smartlist_t *, circuit_get_global_list, (void));
smartlist_t *circuit_get_global_origin_circuit_list(void);
+int circuit_any_opened_circuits(void);
+int circuit_any_opened_circuits_cached(void);
+void circuit_cache_opened_circuit_state(int circuits_are_opened);
+
const char *circuit_state_to_string(int state);
const char *circuit_purpose_to_controller_string(uint8_t purpose);
const char *circuit_purpose_to_controller_hs_state_string(uint8_t purpose);
@@ -58,6 +62,7 @@ void circuit_mark_all_dirty_circs_as_unusable(void);
MOCK_DECL(void, circuit_mark_for_close_, (circuit_t *circ, int reason,
int line, const char *file));
int circuit_get_cpath_len(origin_circuit_t *circ);
+int circuit_get_cpath_opened_len(const origin_circuit_t *);
void circuit_clear_cpath(origin_circuit_t *circ);
crypt_path_t *circuit_get_cpath_hop(origin_circuit_t *circ, int hopnum);
void circuit_get_all_pending_on_channel(smartlist_t *out,