diff options
| author | Andrea Shepard <andrea@torproject.org> | 2014-01-24 03:10:55 -0800 |
|---|---|---|
| committer | Andrea Shepard <andrea@torproject.org> | 2014-09-30 23:14:58 -0700 |
| commit | c5f73e52e54a60581374ff6355104aea3e0f6233 (patch) | |
| tree | 1fe0d940e50b0e51b98d28efbf24ff33cefec78f /src | |
| parent | 030608d68d393c90fb789638e5e93ac6af7d4f5e (diff) | |
| download | tor-c5f73e52e54a60581374ff6355104aea3e0f6233.tar.gz tor-c5f73e52e54a60581374ff6355104aea3e0f6233.zip | |
Make circuitmux_compare_muxes() and circuitmux_get_policy() mockable
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/circuitmux.c | 8 | ||||
| -rw-r--r-- | 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 71bc4efc4a..7175b6bf13 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 9a5ea7d675..00707d97e2 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 */ |