mirrors/openssh
0
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-11-23 18:23:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

upstream: better debugging for connect_next()

Browse Source 
OpenBSD-Commit-ID: d16a307a0711499c971807f324484ed3a6036640
This commit is contained in:
djm@openbsd.org 2022-09-19 08:49:50 +00:00 committed by Damien Miller
parent 1875042c52
commit 231a346c0c
No known key found for this signature in database
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
channels.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * 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, if (getnameinfo(cctx->ai->ai_addr, cctx->ai->ai_addrlen,
ntop, sizeof(ntop), strport, sizeof(strport), ntop, sizeof(ntop), strport, sizeof(strport),
NI_NUMERICHOST|NI_NUMERICSERV) != 0) { NI_NUMERICHOST|NI_NUMERICSERV) != 0) {
error("connect_next: getnameinfo failed"); error_f("getnameinfo failed");
continue; continue;
} }
break; break;
default: default:
continue; continue;
} }
debug_f("start for host %.100s ([%.100s]:%s)",
cctx->host, ntop, strport);
if ((sock = socket(cctx->ai->ai_family, cctx->ai->ai_socktype, if ((sock = socket(cctx->ai->ai_family, cctx->ai->ai_socktype,
cctx->ai->ai_protocol)) == -1) { cctx->ai->ai_protocol)) == -1) {
if (cctx->ai->ai_next == NULL) if (cctx->ai->ai_next == NULL)
@ -4422,9 +4424,8 @@ connect_next(struct channel_connect *cctx)
fatal_f("set_nonblock(%d)", sock); fatal_f("set_nonblock(%d)", sock);
if (connect(sock, cctx->ai->ai_addr, if (connect(sock, cctx->ai->ai_addr,
cctx->ai->ai_addrlen) == -1 && errno != EINPROGRESS) { cctx->ai->ai_addrlen) == -1 && errno != EINPROGRESS) {
debug("connect_next: host %.100s ([%.100s]:%s): " debug_f("host %.100s ([%.100s]:%s): %.100s",
"%.100s", cctx->host, ntop, strport, cctx->host, ntop, strport, strerror(errno));
strerror(errno));
saved_errno = errno; saved_errno = errno;
close(sock); close(sock);
errno = saved_errno; errno = saved_errno;
@ -4432,8 +4433,8 @@ connect_next(struct channel_connect *cctx)
} }
if (cctx->ai->ai_family != AF_UNIX) if (cctx->ai->ai_family != AF_UNIX)
set_nodelay(sock); set_nodelay(sock);
debug("connect_next: host %.100s ([%.100s]:%s) " debug_f("connect host %.100s ([%.100s]:%s) in progress, fd=%d",
"in progress, fd=%d", cctx->host, ntop, strport, sock); cctx->host, ntop, strport, sock);
cctx->ai = cctx->ai->ai_next; cctx->ai = cctx->ai->ai_next;
return sock; return sock;
} }