tor

commit b2849f449b2efa4d6826166a92f35c7627d65f91
parent e3b1e617ae4850280012c95f40e54acdfc897855
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue, 21 Apr 2020 12:22:37 -0400

Merge branch 'maint-0.4.3'

Diffstat:
A
changes/bug33918
 | 
3
+++
M
src/core/or/channeltls.c
 | 
3
++-

2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/changes/bug33918 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
@@ -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);