diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-02-13 09:21:47 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-02-13 09:21:47 -0500 |
| commit | baeff46d3625002a9de5781cd86b6c45834bbe56 (patch) | |
| tree | 67b3a19af9a3bf64f6fd4874b4a45059b042076b /src/core/or/circuitmux_ewma.h | |
| parent | d0c3350218765d43c538df4dd1d548fa9a7c430a (diff) | |
| parent | fd1686c7d8df8d8159fcaab1c59dfabe154afd88 (diff) | |
| download | tor-baeff46d3625002a9de5781cd86b6c45834bbe56.tar.gz tor-baeff46d3625002a9de5781cd86b6c45834bbe56.zip | |
Merge branch 'ticket33290_v2_042' into ticket33290_v2_043
Conflicts:
src/core/or/circuitmux_ewma.c
Diffstat (limited to 'src/core/or/circuitmux_ewma.h')
| -rw-r--r-- | src/core/or/circuitmux_ewma.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/core/or/circuitmux_ewma.h b/src/core/or/circuitmux_ewma.h index fc7e7ebf7f..e41cf9e0f0 100644 --- a/src/core/or/circuitmux_ewma.h +++ b/src/core/or/circuitmux_ewma.h @@ -106,7 +106,9 @@ TO_EWMA_POL_DATA(circuitmux_policy_data_t *pol) { if (!pol) return NULL; else { - tor_assert(pol->magic == EWMA_POL_DATA_MAGIC); + tor_assertf(pol->magic == EWMA_POL_DATA_MAGIC, + "Mismatch: %"PRIu32" != %"PRIu32, + pol->magic, EWMA_POL_DATA_MAGIC); return DOWNCAST(ewma_policy_data_t, pol); } } @@ -121,7 +123,9 @@ TO_EWMA_POL_CIRC_DATA(circuitmux_policy_circ_data_t *pol) { if (!pol) return NULL; else { - tor_assert(pol->magic == EWMA_POL_CIRC_DATA_MAGIC); + tor_assertf(pol->magic == EWMA_POL_CIRC_DATA_MAGIC, + "Mismatch: %"PRIu32" != %"PRIu32, + pol->magic, EWMA_POL_CIRC_DATA_MAGIC); return DOWNCAST(ewma_policy_circ_data_t, pol); } } @@ -132,4 +136,3 @@ STATIC void cell_ewma_initialize_ticks(void); #endif /* defined(CIRCUITMUX_EWMA_PRIVATE) */ #endif /* !defined(TOR_CIRCUITMUX_EWMA_H) */ - |