diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-04-21 12:22:37 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-04-21 12:22:37 -0400 |
| commit | b2849f449b2efa4d6826166a92f35c7627d65f91 (patch) | |
| tree | 08fd6742ca7fa81d8c7258a1b624879d0ef3fbbb | |
| parent | e3b1e617ae4850280012c95f40e54acdfc897855 (diff) | |
| parent | 42507429ce45495667c3c334679425210a291226 (diff) | |
| download | tor-b2849f449b2efa4d6826166a92f35c7627d65f91.tar.gz tor-b2849f449b2efa4d6826166a92f35c7627d65f91.zip | |
Merge branch 'maint-0.4.3'
| -rw-r--r-- | changes/bug33918 | 3 | ||||
| -rw-r--r-- | src/core/or/channeltls.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug33918 b/changes/bug33918 new file mode 100644 index 0000000000..e1467b4aaf --- /dev/null +++ b/changes/bug33918 @@ -0,0 +1,3 @@ + o Minor bugfixes (IPv6, logging): + - Stop truncating IPv6 addresses and ports in channel and connection logs. + Fixes bug 33918; bugfix on 0.2.4.4-alpha. diff --git a/src/core/or/channeltls.c b/src/core/or/channeltls.c index 2a35237d30..5cedd9fbca 100644 --- a/src/core/or/channeltls.c +++ b/src/core/or/channeltls.c @@ -564,7 +564,8 @@ channel_tls_get_transport_name_method(channel_t *chan, char **transport_out) static const char * channel_tls_get_remote_descr_method(channel_t *chan, int flags) { -#define MAX_DESCR_LEN 32 + /* IPv6 address, colon, port */ +#define MAX_DESCR_LEN (TOR_ADDR_BUF_LEN + 1 + 5) static char buf[MAX_DESCR_LEN + 1]; channel_tls_t *tlschan = BASE_CHAN_TO_TLS(chan); |