[tor-commits] [tor/master] relay/circuitbuild: Report IPv6 addresses in a debug log

[nickm at torproject.org]

commit ec5f4f3c5a5aa4d69b2867ba41bc83ba1e6c888a
Author: teor <teor at torproject.org>
Date:   Wed Apr 15 13:07:10 2020 +1000

    relay/circuitbuild: Report IPv6 addresses in a debug log
    
    Part of 33817.
---
 src/feature/relay/circuitbuild_relay.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/feature/relay/circuitbuild_relay.c b/src/feature/relay/circuitbuild_relay.c
index 080781f71..7d3d58977 100644
--- a/src/feature/relay/circuitbuild_relay.c
+++ b/src/feature/relay/circuitbuild_relay.c
@@ -337,9 +337,13 @@ circuit_extend(struct cell_t *cell, struct circuit_t *circ)
                                   &should_launch);
 
   if (!n_chan) {
-    log_debug(LD_CIRC|LD_OR,"Next router (%s): %s.",
-              fmt_addrport(&ec.orport_ipv4.addr,ec.orport_ipv4.port),
-              msg?msg:"????");
+    /* We can't use fmt_addr*() twice in the same function call,
+     * because it uses a static buffer. */
+    log_debug(LD_CIRC|LD_OR, "Next router IPv4 (%s): %s.",
+              fmt_addrport_ap(&ec.orport_ipv4),
+              msg ? msg : "????");
+    log_debug(LD_CIRC|LD_OR, "Next router IPv6 (%s).",
+              fmt_addrport_ap(&ec.orport_ipv6));
 
     circuit_open_connection_for_extend(&ec, circ, should_launch);