From 0bd12cfe99f16f1e3130e8866e15ff703cc4b828 Mon Sep 17 00:00:00 2001 From: George Kadianakis Date: Wed, 4 Nov 2020 15:28:23 +0200 Subject: [PATCH 1/2] Revert HSv3 stats string formatting to its old %u self. The rest of rephist.c is doing the same kind of unsigned casting. For example see rep_hist_format_buffer_stats() and rep_hist_format_exit_stats(). The previous switch to %ld made Appveyor fail: https://ci.appveyor.com/project/torproject/tor/builds/36118502 --- src/feature/stats/rephist.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/feature/stats/rephist.c b/src/feature/stats/rephist.c index 59f38fe603..f8d7887e65 100644 --- a/src/feature/stats/rephist.c +++ b/src/feature/stats/rephist.c @@ -2009,11 +2009,11 @@ rep_hist_format_hs_stats(time_t now, bool is_v3) ONIONS_SEEN_EPSILON); format_iso_time(t, now); - tor_asprintf(&hs_stats_string, "%s %s (%ld s)\n" + tor_asprintf(&hs_stats_string, "%s %s (%u s)\n" "%s %"PRId64" delta_f=%d epsilon=%.2f bin_size=%d\n" "%s %"PRId64" delta_f=%d epsilon=%.2f bin_size=%d\n", is_v3 ? "hidserv-v3-stats-end" : "hidserv-stats-end", - t, now - start_of_hs_stats_interval, + t, (unsigned) (now - start_of_hs_stats_interval), is_v3 ? "hidserv-rend-v3-relayed-cells" : "hidserv-rend-relayed-cells", obfuscated_cells_seen, REND_CELLS_DELTA_F, From eaf814bd50be3588d699e2e773a2d57a9ebf58cb Mon Sep 17 00:00:00 2001 From: George Kadianakis Date: Wed, 4 Nov 2020 15:32:05 +0200 Subject: [PATCH 2/2] Constify result of CONST_TO_OR_CIRCUIT. --- src/core/or/command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/or/command.c b/src/core/or/command.c index 7767217275..e2bab87def 100644 --- a/src/core/or/command.c +++ b/src/core/or/command.c @@ -609,7 +609,7 @@ command_process_relay_cell(cell_t *cell, channel_t *chan) * (which is the service->RP circuit) to see if it was using TAP and * hence if it's a v2 circuit. That's because client->RP circuits can * still use ntor even on v2; but service->RP will always use TAP. */ - or_circuit_t *splice = CONST_TO_OR_CIRCUIT(circ)->rend_splice; + const or_circuit_t *splice = CONST_TO_OR_CIRCUIT(circ)->rend_splice; if (splice->used_legacy_circuit_handshake) { is_v2 = true; }