67 lines
2.3 KiB
Diff
67 lines
2.3 KiB
Diff
From 231a346c0c67cc7ca098360f9a554fa7d4f1eddb Mon Sep 17 00:00:00 2001
|
|
From: "djm@openbsd.org" <djm@openbsd.org>
|
|
Date: Mon, 19 Sep 2022 08:49:50 +0000
|
|
Subject: [PATCH] upstream: better debugging for connect_next()
|
|
|
|
OpenBSD-Commit-ID: d16a307a0711499c971807f324484ed3a6036640
|
|
|
|
Reference:https://github.com/openssh/openssh-portable/commit/231a346c0c67cc7ca098360f9a554fa7d4f1eddb
|
|
Conflict:NA
|
|
---
|
|
channels.c | 15 ++++++++-------
|
|
1 file changed, 8 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/channels.c b/channels.c
|
|
index 3ac51bac..6a78de9d 100644
|
|
--- a/channels.c
|
|
+++ b/channels.c
|
|
@@ -1,4 +1,4 @@
|
|
-/* $OpenBSD: channels.c,v 1.408 2021/09/14 11:04:21 mbuhl 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
|
|
@@ -4403,13 +4403,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)
|
|
@@ -4422,9 +4424,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;
|
|
@@ -4432,8 +4433,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;
|
|
}
|
|
--
|
|
2.23.0
|
|
|