torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

connection_describe_peer(): add nonzero ports to nonscrubbed addrs.

Browse Source
This commit is contained in:
Nick Mathewson
2020-07-13 14:47:58 -04:00
parent 8fbafd1402
commit aa33b88778
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/mainloop/connection.c
+10 -3
View File
@@ -461,8 +461,15 @@ connection_describe_peer_internal(const connection_t *conn,
}
}
if (scrub) {
address = safe_str(address);
char portbuf[7];
portbuf[0]=0;
if (scrub && get_options()->SafeLogging_ != SAFELOG_SCRUB_NONE) {
address = "[scrubbed]";
} else {
/* Only set the port if we're not scrubbing the address. */
if (conn->port != 0) {
tor_snprintf(portbuf, sizeof(portbuf), ":%d", conn->port);
}
}
const char *sp = include_preposition ? " " : "";
@@ -470,7 +477,7 @@ connection_describe_peer_internal(const connection_t *conn,
prep = "";
tor_snprintf(peer_buf, sizeof(peer_buf),
"%s%s%s%s", prep, sp, address, extra_buf);
"%s%s%s%s%s", prep, sp, address, portbuf, extra_buf);
return peer_buf;
}