1
0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-08-10 06:23:01 +03:00

Fixed more fd checks.

This commit is contained in:
Andreas Schneider
2010-06-17 13:47:29 +02:00
parent 937268eb3e
commit 558f889aae
3 changed files with 4 additions and 4 deletions

View File

@@ -398,7 +398,7 @@ int ssh_options_set(ssh_session session, enum ssh_options_e type,
break;
case SSH_OPTIONS_FD:
if (value == NULL) {
session->fd = -1;
session->fd = SSH_INVALID_SOCKET;
} else {
socket_t *x = (socket_t *) value;

View File

@@ -150,7 +150,7 @@ int ssh_bind_listen(ssh_bind sshbind) {
}
fd = bind_socket(sshbind, host, sshbind->bindport);
if (fd < 0) {
if (fd == SSH_INVALID_SOCKET) {
return -1;
}
sshbind->bindfd = fd;

View File

@@ -312,7 +312,7 @@ int ssh_socket_unix(ssh_socket s, const char *path) {
snprintf(sunaddr.sun_path, sizeof(sunaddr.sun_path), "%s", path);
fd = socket(AF_UNIX, SOCK_STREAM, 0);
if (fd < 0) {
if (fd == SSH_INVALID_SOCKET) {
return -1;
}
@@ -912,7 +912,7 @@ int ssh_socket_connect(ssh_socket s, const char *host, int port, const char *bin
return SSH_ERROR;
fd=ssh_connect_host_nonblocking(s->session,host,bind_addr,port);
ssh_log(session,SSH_LOG_PROTOCOL,"Nonblocking connection socket: %d",fd);
if(fd < 0)
if(fd == SSH_INVALID_SOCKET)
return SSH_ERROR;
ssh_socket_set_fd(s,fd);
s->state=SSH_SOCKET_CONNECTING;