mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-13 22:53:44 +01:00
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>
This commit is contained in:
parent
598bf986b6
commit
257f50b22f
@ -444,7 +444,7 @@ hs_cell_parse_introduce2(hs_cell_introduce2_data_t *data,
|
|||||||
encrypted_section_len, &elapsed)) {
|
encrypted_section_len, &elapsed)) {
|
||||||
log_warn(LD_REND, "Possible replay detected! An INTRODUCE2 cell with the"
|
log_warn(LD_REND, "Possible replay detected! An INTRODUCE2 cell with the"
|
||||||
"same ENCRYPTED section was seen %ld seconds ago. "
|
"same ENCRYPTED section was seen %ld seconds ago. "
|
||||||
"Dropping cell.", elapsed);
|
"Dropping cell.", (long int) elapsed);
|
||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -589,7 +589,7 @@ can_relaunch_service_rendezvous_point(const origin_circuit_t *circ)
|
|||||||
safe_str_client(
|
safe_str_client(
|
||||||
extend_info_describe(circ->build_state->chosen_exit)),
|
extend_info_describe(circ->build_state->chosen_exit)),
|
||||||
circ->build_state->failure_count,
|
circ->build_state->failure_count,
|
||||||
circ->build_state->expiry_time);
|
(long int) circ->build_state->expiry_time);
|
||||||
goto disallow;
|
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
|
* cell), we are already trying to connect to that rend point (and may
|
||||||
* have already succeeded); drop this cell. */
|
* have already succeeded); drop this cell. */
|
||||||
log_info(LD_REND, "We received an INTRODUCE2 cell with same REND_COOKIE "
|
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;
|
goto done;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1875,8 +1875,9 @@ can_service_launch_intro_circuit(hs_service_t *service, time_t now)
|
|||||||
safe_str_client(service->onion_address),
|
safe_str_client(service->onion_address),
|
||||||
get_max_intro_circ_per_period(service),
|
get_max_intro_circ_per_period(service),
|
||||||
INTRO_CIRC_RETRY_PERIOD,
|
INTRO_CIRC_RETRY_PERIOD,
|
||||||
service->state.num_intro_circ_launched, elapsed_time,
|
service->state.num_intro_circ_launched,
|
||||||
INTRO_CIRC_RETRY_PERIOD - elapsed_time);
|
(long int) elapsed_time,
|
||||||
|
(long int) INTRO_CIRC_RETRY_PERIOD - elapsed_time);
|
||||||
tor_free(msg);
|
tor_free(msg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user