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

Rewrite strerror to ssh_strerror

Browse Source 
Signed-off-by: Norbert Pocs <npocs@redhat.com>
Reviewed-by: Jakub Jelen <jjelen@redhat.com>
This commit is contained in:
Norbert Pocs
2022-07-04 10:08:01 +02:00
committed by Jakub Jelen
parent b44b749f28
commit 3efe7c3cfb
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/connect.c
View File

@@ -183,11 +183,13 @@ socket_t ssh_connect_host_nonblocking(ssh_session session, const char *host,
} }
for (itr = ai; itr != NULL; itr = itr->ai_next) { for (itr = ai; itr != NULL; itr = itr->ai_next) {
char err_msg[SSH_ERRNO_MSG_MAX] = {0};
/* create socket */ /* create socket */
s = socket(itr->ai_family, itr->ai_socktype, itr->ai_protocol); s = socket(itr->ai_family, itr->ai_socktype, itr->ai_protocol);
if (s < 0) { if (s < 0) {
ssh_set_error(session, SSH_FATAL, ssh_set_error(session, SSH_FATAL,
"Socket create failed: %s", strerror(errno)); "Socket create failed: %s",
ssh_strerror(errno, err_msg, SSH_ERRNO_MSG_MAX));
continue; continue;
} }
@@ -214,7 +216,8 @@ socket_t ssh_connect_host_nonblocking(ssh_session session, const char *host,
{ {
if (bind(s, bind_itr->ai_addr, bind_itr->ai_addrlen) < 0) { if (bind(s, bind_itr->ai_addr, bind_itr->ai_addrlen) < 0) {
ssh_set_error(session, SSH_FATAL, ssh_set_error(session, SSH_FATAL,
"Binding local address: %s", strerror(errno)); "Binding local address: %s",
ssh_strerror(errno, err_msg, SSH_ERRNO_MSG_MAX));
continue; continue;
} else { } else {
break; break;
@@ -246,7 +249,7 @@ socket_t ssh_connect_host_nonblocking(ssh_session session, const char *host,
if (rc < 0) { if (rc < 0) {
ssh_set_error(session, SSH_FATAL, ssh_set_error(session, SSH_FATAL,
"Failed to set TCP_NODELAY on socket: %s", "Failed to set TCP_NODELAY on socket: %s",
strerror(errno)); ssh_strerror(errno, err_msg, SSH_ERRNO_MSG_MAX));
ssh_connect_socket_close(s); ssh_connect_socket_close(s);
s = -1; s = -1;
continue; continue;
@@ -257,7 +260,8 @@ socket_t ssh_connect_host_nonblocking(ssh_session session, const char *host,
rc = connect(s, itr->ai_addr, itr->ai_addrlen); rc = connect(s, itr->ai_addr, itr->ai_addrlen);
if (rc == -1 && (errno != 0) && (errno != EINPROGRESS)) { if (rc == -1 && (errno != 0) && (errno != EINPROGRESS)) {
ssh_set_error(session, SSH_FATAL, ssh_set_error(session, SSH_FATAL,
"Failed to connect: %s", strerror(errno)); "Failed to connect: %s",
ssh_strerror(errno, err_msg, SSH_ERRNO_MSG_MAX));
ssh_connect_socket_close(s); ssh_connect_socket_close(s);
s = -1; s = -1;
continue; continue;