commit 257f50b22fbaf9c9cb5859e257437b24af46c7ab Author: David Goulet dgoulet@torproject.org Date: Fri Aug 11 15:08:45 2017 -0400

Make Windows happy for time_t printf format

Our Windows compiler treats "time_t" as long long int but Linux likes it long int so cast those to make Windows happy.

Signed-off-by: David Goulet dgoulet@torproject.org --- src/or/hs_cell.c | 2 +- src/or/hs_circuit.c | 5 +++-- src/or/hs_service.c | 5 +++-- 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/or/hs_cell.c b/src/or/hs_cell.c index a0e907460..7728b7705 100644 --- a/src/or/hs_cell.c +++ b/src/or/hs_cell.c @@ -444,7 +444,7 @@ hs_cell_parse_introduce2(hs_cell_introduce2_data_t *data, encrypted_section_len, &elapsed)) { log_warn(LD_REND, "Possible replay detected! An INTRODUCE2 cell with the" "same ENCRYPTED section was seen %ld seconds ago. " - "Dropping cell.", elapsed); + "Dropping cell.", (long int) elapsed); goto done; }

diff --git a/src/or/hs_circuit.c b/src/or/hs_circuit.c index d0265dc54..6d1cdd4eb 100644 --- a/src/or/hs_circuit.c +++ b/src/or/hs_circuit.c @@ -589,7 +589,7 @@ can_relaunch_service_rendezvous_point(const origin_circuit_t *circ) safe_str_client( extend_info_describe(circ->build_state->chosen_exit)), circ->build_state->failure_count, - circ->build_state->expiry_time); + (long int) circ->build_state->expiry_time); goto disallow; }

@@ -978,7 +978,8 @@ hs_circ_handle_introduce2(const hs_service_t *service, * cell), we are already trying to connect to that rend point (and may * have already succeeded); drop this cell. */ log_info(LD_REND, "We received an INTRODUCE2 cell with same REND_COOKIE " - "field %ld seconds ago. Dropping cell.", elapsed); + "field %ld seconds ago. Dropping cell.", + (long int) elapsed); goto done; }

diff --git a/src/or/hs_service.c b/src/or/hs_service.c index cb3a49cb8..3f6de0ba2 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -1875,8 +1875,9 @@ can_service_launch_intro_circuit(hs_service_t *service, time_t now) safe_str_client(service->onion_address), get_max_intro_circ_per_period(service), INTRO_CIRC_RETRY_PERIOD, - service->state.num_intro_circ_launched, elapsed_time, - INTRO_CIRC_RETRY_PERIOD - elapsed_time); + service->state.num_intro_circ_launched, + (long int) elapsed_time, + (long int) INTRO_CIRC_RETRY_PERIOD - elapsed_time); tor_free(msg); } }