diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-09-20 14:19:47 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-09-20 14:19:47 -0400 |
| commit | a406255cf395b053d6216df4252ad1320ab73a54 (patch) | |
| tree | 5f092bff9e424b1218f05540408dc117a80e6f81 | |
| parent | 4e2028152d31e27c44d0c2ef31dca829c6ae2d2e (diff) | |
| parent | 72e30f26ec291baba202b71e121c3211af2db371 (diff) | |
| download | tor-a406255cf395b053d6216df4252ad1320ab73a54.tar.gz tor-a406255cf395b053d6216df4252ad1320ab73a54.zip | |
Merge branch 'bug23512-v4-029-fixes'
| -rw-r--r-- | src/feature/stats/rephist.c | 4 | ||||
| -rw-r--r-- | src/test/test_relay.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/feature/stats/rephist.c b/src/feature/stats/rephist.c index edb079ef2d..2588bb4c00 100644 --- a/src/feature/stats/rephist.c +++ b/src/feature/stats/rephist.c @@ -998,7 +998,7 @@ rep_hist_load_mtbf_data(time_t now) /** Structure to track bandwidth use, and remember the maxima for a given * time period. */ -typedef struct bw_array_t { +struct bw_array_t { /** Observation array: Total number of bytes transferred in each of the last * NUM_SECS_ROLLING_MEASURE seconds. This is used as a circular array. */ uint64_t obs[NUM_SECS_ROLLING_MEASURE]; @@ -1025,7 +1025,7 @@ typedef struct bw_array_t { /** Circular array of the total bandwidth usage for the last NUM_TOTALS * periods */ uint64_t totals[NUM_TOTALS]; -} bw_array_t; +}; /** Shift the current period of b forward by one. */ STATIC void diff --git a/src/test/test_relay.c b/src/test/test_relay.c index 65b9a2f940..c3fd6578e1 100644 --- a/src/test/test_relay.c +++ b/src/test/test_relay.c @@ -113,7 +113,7 @@ test_relay_close_circuit(void *arg) tt_int_op(new_count, OP_EQ, old_count + 1); /* Ensure our write totals are 0 */ - tt_int_op(find_largest_max(write_array), OP_EQ, 0); + tt_u64_op(find_largest_max(write_array), OP_EQ, 0); /* Mark the circuit for close */ circuit_mark_for_close(TO_CIRCUIT(orcirc), 0); @@ -122,7 +122,7 @@ test_relay_close_circuit(void *arg) advance_obs(write_array); commit_max(write_array); /* Check for two cells plus overhead */ - tt_int_op(find_largest_max(write_array), OP_EQ, + tt_u64_op(find_largest_max(write_array), OP_EQ, 2*(get_cell_network_size(nchan->wide_circ_ids) +TLS_PER_CELL_OVERHEAD)); |