nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

whitespace fixes

Browse Source
This commit is contained in:
Nick Mathewson 2017-05-08 13:57:08 -04:00
parent 4d30dde156
commit fb97f76e71
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/or/channel.c
View File

@ -86,7 +86,6 @@ static smartlist_t *active_listeners = NULL;
/* All channel_listener_t instances in LISTENING state */ /* All channel_listener_t instances in LISTENING state */
static smartlist_t *finished_listeners = NULL; static smartlist_t *finished_listeners = NULL;
/** Map from channel->global_identifier to channel. Contains the same /** Map from channel->global_identifier to channel. Contains the same
* elements as all_channels. */ * elements as all_channels. */
HT_HEAD(channel_gid_map, channel_s) channel_gid_map = HT_INITIALIZER(); HT_HEAD(channel_gid_map, channel_s) channel_gid_map = HT_INITIALIZER();

2
src/or/channelpadding.c
View File

@ -564,7 +564,7 @@ channelpadding_get_channel_idle_timeout(const channel_t *chan,
unsigned int timeout; unsigned int timeout;
/* Non-canonical and client channels only last for 3-4.5 min when idle */ /* Non-canonical and client channels only last for 3-4.5 min when idle */
if (!is_canonical || CHANNEL_IS_CLIENT(chan, options)) { if (!is_canonical || CHANNEL_IS_CLIENT(chan, options)) {
#define CONNTIMEOUT_CLIENTS_BASE 180 // 3 to 4.5 min #define CONNTIMEOUT_CLIENTS_BASE 180 // 3 to 4.5 min
timeout = CONNTIMEOUT_CLIENTS_BASE timeout = CONNTIMEOUT_CLIENTS_BASE
+ crypto_rand_int(CONNTIMEOUT_CLIENTS_BASE/2); + crypto_rand_int(CONNTIMEOUT_CLIENTS_BASE/2);

5
src/or/channeltls.c
View File

@ -1806,12 +1806,13 @@ channel_tls_process_netinfo_cell(cell_t *cell, channel_tls_t *chan)
if (me && !TLS_CHAN_TO_BASE(chan)->is_canonical_to_peer && if (me && !TLS_CHAN_TO_BASE(chan)->is_canonical_to_peer &&
channel_is_canonical(TLS_CHAN_TO_BASE(chan))) { channel_is_canonical(TLS_CHAN_TO_BASE(chan))) {
const char *descr =
TLS_CHAN_TO_BASE(chan)->get_remote_descr(TLS_CHAN_TO_BASE(chan), 0);
log_info(LD_OR, log_info(LD_OR,
"We made a connection to a relay at %s (fp=%s) but we think " "We made a connection to a relay at %s (fp=%s) but we think "
"they will not consider this connection canonical. They " "they will not consider this connection canonical. They "
"think we are at %s, but we think its %s.", "think we are at %s, but we think its %s.",
safe_str(TLS_CHAN_TO_BASE(chan)->get_remote_descr(TLS_CHAN_TO_BASE(chan), safe_str(descr),
0)),
safe_str(hex_str(chan->conn->identity_digest, DIGEST_LEN)), safe_str(hex_str(chan->conn->identity_digest, DIGEST_LEN)),
safe_str(tor_addr_is_null(&my_apparent_addr) ? safe_str(tor_addr_is_null(&my_apparent_addr) ?
"<none>" : fmt_and_decorate_addr(&my_apparent_addr)), "<none>" : fmt_and_decorate_addr(&my_apparent_addr)),