better debugging for connect_next()

diff --git a/usr.bin/ssh/channels.c b/usr.bin/ssh/channels.c
index 57b641c..0c42fb5 100644 (file)
--- a/usr.bin/ssh/channels.c
+++ b/usr.bin/ssh/channels.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.419 2022/05/05 00:56:58 djm Exp $ */
+/* $OpenBSD: channels.c,v 1.420 2022/09/19 08:49:50 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -4354,13 +4354,15 @@ connect_next(struct channel_connect *cctx)
                        if (getnameinfo(cctx->ai->ai_addr, cctx->ai->ai_addrlen,
                            ntop, sizeof(ntop), strport, sizeof(strport),
                            NI_NUMERICHOST|NI_NUMERICSERV) != 0) {
-                               error("connect_next: getnameinfo failed");
+                               error_f("getnameinfo failed");
                                continue;
                        }
                        break;
                default:
                        continue;
                }
+               debug_f("start for host %.100s ([%.100s]:%s)",
+                   cctx->host, ntop, strport);
                if ((sock = socket(cctx->ai->ai_family, cctx->ai->ai_socktype,
                    cctx->ai->ai_protocol)) == -1) {
                        if (cctx->ai->ai_next == NULL)
@@ -4373,9 +4375,8 @@ connect_next(struct channel_connect *cctx)
                        fatal_f("set_nonblock(%d)", sock);
                if (connect(sock, cctx->ai->ai_addr,
                    cctx->ai->ai_addrlen) == -1 && errno != EINPROGRESS) {
-                       debug("connect_next: host %.100s ([%.100s]:%s): "
-                           "%.100s", cctx->host, ntop, strport,
-                           strerror(errno));
+                       debug_f("host %.100s ([%.100s]:%s): %.100s",
+                           cctx->host, ntop, strport, strerror(errno));
                        saved_errno = errno;
                        close(sock);
                        errno = saved_errno;
@@ -4383,8 +4384,8 @@ connect_next(struct channel_connect *cctx)
                }
                if (cctx->ai->ai_family != AF_UNIX)
                        set_nodelay(sock);
-               debug("connect_next: host %.100s ([%.100s]:%s) "
-                   "in progress, fd=%d", cctx->host, ntop, strport, sock);
+               debug_f("connect host %.100s ([%.100s]:%s) in progress, fd=%d",
+                   cctx->host, ntop, strport, sock);
                cctx->ai = cctx->ai->ai_next;
                return sock;
        }