diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-07-14 14:28:33 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-07-16 09:02:10 -0400 |
| commit | ab428ef60b701075158f1c06676bcc394f0969b2 (patch) | |
| tree | f5a800772ff36fa7d8b58fef917505d23bd8faca /src/core/or/channelpadding.c | |
| parent | 4f4785a8c113806d00c6a31154956edb86c1639f (diff) | |
| download | tor-ab428ef60b701075158f1c06676bcc394f0969b2.tar.gz tor-ab428ef60b701075158f1c06676bcc394f0969b2.zip | |
Collapse channel_get_*_remote_addr() into a single function.
Since we can list the real address and the canonical one in a
human-readable format we don't need to pick.
Diffstat (limited to 'src/core/or/channelpadding.c')
| -rw-r--r-- | src/core/or/channelpadding.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/or/channelpadding.c b/src/core/or/channelpadding.c index 0e88b8b3bd..d0c43e8bdc 100644 --- a/src/core/or/channelpadding.c +++ b/src/core/or/channelpadding.c @@ -265,7 +265,7 @@ channelpadding_update_padding_for_channel(channel_t *chan, log_fn_ratelim(&relay_limit,LOG_PROTOCOL_WARN,LD_PROTOCOL, "Got a PADDING_NEGOTIATE from relay at %s (%s). " "This should not happen.", - channel_get_canonical_remote_descr(chan), + channel_describe_peer(chan), hex_str(chan->identity_digest, DIGEST_LEN)); return -1; } @@ -399,7 +399,7 @@ channelpadding_send_padding_cell_for_callback(channel_t *chan) "Sending netflow keepalive on %"PRIu64" to %s (%s) after " "%"PRId64" ms. Delta %"PRId64"ms", (chan->global_identifier), - safe_str_client(channel_get_canonical_remote_descr(chan)), + safe_str_client(channel_describe_peer(chan)), safe_str_client(hex_str(chan->identity_digest, DIGEST_LEN)), (monotime_coarse_diff_msec(&chan->timestamp_xfer,&now)), ( |