shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-11 18:50:28 +09:00
Code Issues Packages Projects Releases Wiki Activity

connect: Improve logging around the connection code

Browse Source 
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Jakub Jelen
2025-12-16 17:23:09 +01:00
committed by Samir Benmendil
parent 228208af5e
commit f52be27114
1 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/connect.c
View File

@@ -167,7 +167,9 @@ socket_t ssh_connect_host_nonblocking(ssh_session session, const char *host,
int rc; int rc;
struct addrinfo *ai = NULL; struct addrinfo *ai = NULL;
struct addrinfo *itr = NULL; struct addrinfo *itr = NULL;
char addrname[NI_MAXHOST], portname[NI_MAXSERV];
SSH_LOG(SSH_LOG_PACKET, "Resolve target hostname %s port %d", host, port);
rc = getai(host, port, &ai); rc = getai(host, port, &ai);
if (rc != 0) { if (rc != 0) {
ssh_set_error(session, SSH_FATAL, ssh_set_error(session, SSH_FATAL,
@@ -192,7 +194,7 @@ socket_t ssh_connect_host_nonblocking(ssh_session session, const char *host,
struct addrinfo *bind_ai = NULL; struct addrinfo *bind_ai = NULL;
struct addrinfo *bind_itr = NULL; struct addrinfo *bind_itr = NULL;
SSH_LOG(SSH_LOG_PACKET, "Resolving %s", bind_addr); SSH_LOG(SSH_LOG_PACKET, "Resolving bind address %s", bind_addr);
rc = getai(bind_addr, 0, &bind_ai); rc = getai(bind_addr, 0, &bind_ai);
if (rc != 0) { if (rc != 0) {
@@ -252,7 +254,28 @@ socket_t ssh_connect_host_nonblocking(ssh_session session, const char *host,
} }
} }
rc = getnameinfo(itr->ai_addr,
itr->ai_addrlen,
addrname,
sizeof(addrname),
portname,
sizeof(portname),
NI_NUMERICHOST | NI_NUMERICSERV);
if (rc != 0) {
ssh_set_error(session, SSH_FATAL,
"getnameinfo failed: %s",
ssh_strerror(errno, err_msg, SSH_ERRNO_MSG_MAX));
ssh_connect_socket_close(s);
s = -1;
continue;
}
errno = 0; errno = 0;
SSH_LOG(SSH_LOG_PACKET,
"Connecting to host %s [%s] port %s",
host,
addrname,
portname);
rc = connect(s, itr->ai_addr, itr->ai_addrlen); rc = connect(s, itr->ai_addr, itr->ai_addrlen);
if (rc == -1) { if (rc == -1) {
if ((errno != 0) && (errno != EINPROGRESS)) { if ((errno != 0) && (errno != EINPROGRESS)) {
@@ -263,6 +286,7 @@ socket_t ssh_connect_host_nonblocking(ssh_session session, const char *host,
s = -1; s = -1;
} else { } else {
if (first == -1) { if (first == -1) {
SSH_LOG(SSH_LOG_PACKET, "EINPROGRESS => Store for later.");
first = s; first = s;
} else { /* errno == EINPROGRESS */ } else { /* errno == EINPROGRESS */
/* save only the first "working" socket */ /* save only the first "working" socket */