diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-03-04 11:03:30 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-03-04 11:03:30 -0500 |
| commit | ab225aaf28d7a25a58b5f11f1c59ded80570b594 (patch) | |
| tree | 2cef1ba108879d507296d6a089f9cebc5237fad8 /src/or/circuitlist.h | |
| parent | bfa0e022bc6ec629473d3dfb598cad698ceee256 (diff) | |
| parent | bb375442141b4a5b301212394ce3e106cb34daf2 (diff) | |
| download | tor-ab225aaf28d7a25a58b5f11f1c59ded80570b594.tar tor-ab225aaf28d7a25a58b5f11f1c59ded80570b594.tar.gz | |
Merge branch 'bug10169_025_v2'
Conflicts:
src/test/test.c
Diffstat (limited to 'src/or/circuitlist.h')
| -rw-r--r-- | src/or/circuitlist.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/or/circuitlist.h b/src/or/circuitlist.h index 1c8cf7de2..a29c29a49 100644 --- a/src/or/circuitlist.h +++ b/src/or/circuitlist.h @@ -53,8 +53,8 @@ origin_circuit_t *circuit_find_to_cannibalize(uint8_t purpose, extend_info_t *info, int flags); void circuit_mark_all_unused_circs(void); void circuit_mark_all_dirty_circs_as_unusable(void); -void circuit_mark_for_close_(circuit_t *circ, int reason, - int line, const char *file); +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); void circuit_clear_cpath(origin_circuit_t *circ); crypt_path_t *circuit_get_cpath_hop(origin_circuit_t *circ, int hopnum); @@ -76,6 +76,9 @@ void channel_note_destroy_not_pending(channel_t *chan, circid_t id); #ifdef CIRCUITLIST_PRIVATE STATIC void circuit_free(circuit_t *circ); STATIC size_t n_cells_in_circ_queues(const circuit_t *c); +STATIC uint32_t circuit_max_queued_data_age(const circuit_t *c, uint32_t now); +STATIC uint32_t circuit_max_queued_cell_age(const circuit_t *c, uint32_t now); +STATIC uint32_t circuit_max_queued_item_age(const circuit_t *c, uint32_t now); #endif #endif |