commit c5f73e52e54a60581374ff6355104aea3e0f6233 Author: Andrea Shepard andrea@torproject.org Date: Fri Jan 24 03:10:55 2014 -0800
Make circuitmux_compare_muxes() and circuitmux_get_policy() mockable --- src/or/circuitmux.c | 8 ++++---- src/or/circuitmux.h | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/or/circuitmux.c b/src/or/circuitmux.c index 71bc4ef..7175b6b 100644 --- a/src/or/circuitmux.c +++ b/src/or/circuitmux.c @@ -621,8 +621,8 @@ circuitmux_clear_policy(circuitmux_t *cmux) * Return the policy currently installed on a circuitmux_t */
-const circuitmux_policy_t * -circuitmux_get_policy(circuitmux_t *cmux) +MOCK_IMPL(const circuitmux_policy_t *, +circuitmux_get_policy, (circuitmux_t *cmux)) { tor_assert(cmux);
@@ -1961,8 +1961,8 @@ circuitmux_count_queued_destroy_cells(const channel_t *chan, * support the cmp_cmux method, return 0. */
-int -circuitmux_compare_muxes(circuitmux_t *cmux_1, circuitmux_t *cmux_2) +MOCK_IMPL(int, +circuitmux_compare_muxes, (circuitmux_t *cmux_1, circuitmux_t *cmux_2)) { const circuitmux_policy_t *policy;
diff --git a/src/or/circuitmux.h b/src/or/circuitmux.h index 9a5ea7d..00707d9 100644 --- a/src/or/circuitmux.h +++ b/src/or/circuitmux.h @@ -108,7 +108,8 @@ void circuitmux_free(circuitmux_t *cmux);
/* Policy control */ void circuitmux_clear_policy(circuitmux_t *cmux); -const circuitmux_policy_t * circuitmux_get_policy(circuitmux_t *cmux); +MOCK_DECL(const circuitmux_policy_t *, + circuitmux_get_policy, (circuitmux_t *cmux)); void circuitmux_set_policy(circuitmux_t *cmux, const circuitmux_policy_t *pol);
@@ -152,7 +153,8 @@ void circuitmux_mark_destroyed_circids_usable(circuitmux_t *cmux, channel_t *chan);
/* Optional interchannel comparisons for scheduling */ -int circuitmux_compare_muxes(circuitmux_t *cmux_1, circuitmux_t *cmux_2); +MOCK_DECL(int, circuitmux_compare_muxes, + (circuitmux_t *cmux_1, circuitmux_t *cmux_2));
#endif /* TOR_CIRCUITMUX_H */
tor-commits@lists.torproject.org