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

Merge branch 'tor-gitlab/mr/228'

Browse Source
This commit is contained in:
David Goulet 2021-10-04 14:59:04 -04:00
commit e4e88c4b2e
2 changed files with 40 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/ticket40182 Normal file
View File

@ -0,0 +1,4 @@
o Minor features(logging):
- If a channel has never received, transmitted a cell or seen a client,
do not calculate time diffs against 1/1/1970 but log another prettier message
Fixes 40182

54
src/core/or/channel.c
View File

@ -2629,24 +2629,42 @@ channel_dump_statistics, (channel_t *chan, int severity))
circuitmux_num_circuits(chan->cmux) : 0); circuitmux_num_circuits(chan->cmux) : 0);
/* Describe timestamps */ /* Describe timestamps */
tor_log(severity, LD_GENERAL, if (chan->timestamp_client == 0) {
" * Channel %"PRIu64 " was last used by a " tor_log(severity, LD_GENERAL,
"client at %"PRIu64 " (%"PRIu64 " seconds ago)", " * Channel %"PRIu64 " was never used by a "
(chan->global_identifier), "client", (chan->global_identifier));
(uint64_t)(chan->timestamp_client), } else {
(uint64_t)(now - chan->timestamp_client)); tor_log(severity, LD_GENERAL,
tor_log(severity, LD_GENERAL, " * Channel %"PRIu64 " was last used by a "
" * Channel %"PRIu64 " last received a cell " "client at %"PRIu64 " (%"PRIu64 " seconds ago)",
"at %"PRIu64 " (%"PRIu64 " seconds ago)", (chan->global_identifier),
(chan->global_identifier), (uint64_t)(chan->timestamp_client),
(uint64_t)(chan->timestamp_recv), (uint64_t)(now - chan->timestamp_client));
(uint64_t)(now - chan->timestamp_recv)); }
tor_log(severity, LD_GENERAL, if (chan->timestamp_recv == 0) {
" * Channel %"PRIu64 " last transmitted a cell " tor_log(severity, LD_GENERAL,
"at %"PRIu64 " (%"PRIu64 " seconds ago)", " * Channel %"PRIu64 " never received a cell",
(chan->global_identifier), (chan->global_identifier));
(uint64_t)(chan->timestamp_xmit), } else {
(uint64_t)(now - chan->timestamp_xmit)); tor_log(severity, LD_GENERAL,
" * Channel %"PRIu64 " last received a cell "
"at %"PRIu64 " (%"PRIu64 " seconds ago)",
(chan->global_identifier),
(uint64_t)(chan->timestamp_recv),
(uint64_t)(now - chan->timestamp_recv));
}
if (chan->timestamp_xmit == 0) {
tor_log(severity, LD_GENERAL,
" * Channel %"PRIu64 " never transmitted a cell",
(chan->global_identifier));
} else {
tor_log(severity, LD_GENERAL,
" * Channel %"PRIu64 " last transmitted a cell "
"at %"PRIu64 " (%"PRIu64 " seconds ago)",
(chan->global_identifier),
(uint64_t)(chan->timestamp_xmit),
(uint64_t)(now - chan->timestamp_xmit));
}
/* Describe counters and rates */ /* Describe counters and rates */
tor_log(severity, LD_GENERAL, tor_log(severity, LD_GENERAL,