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

client: Fixed fd type and checks.

Browse Source
This commit is contained in:
Andreas Schneider
2010-06-17 13:33:52 +02:00
parent 544fc28e6b
commit 21d918c68a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libssh/client.c
View File

@@ -481,7 +481,7 @@ int ssh_service_request(ssh_session session, const char *service) {
int ssh_connect(ssh_session session) { int ssh_connect(ssh_session session) {
int ssh1 = 0; int ssh1 = 0;
int ssh2 = 0; int ssh2 = 0;
int fd = -1; socket_t fd = SSH_INVALID_SOCKET;
int ret; int ret;
if (session == NULL) { if (session == NULL) {
@@ -498,7 +498,7 @@ int ssh_connect(ssh_session session) {
leave_function(); leave_function();
return SSH_ERROR; return SSH_ERROR;
} }
if (session->fd == -1 && session->host == NULL && if (session->fd == SSH_INVALID_SOCKET && session->host == NULL &&
session->ProxyCommand == NULL) { session->ProxyCommand == NULL) {
ssh_set_error(session, SSH_FATAL, "Hostname required"); ssh_set_error(session, SSH_FATAL, "Hostname required");
leave_function(); leave_function();
@@ -512,7 +512,7 @@ int ssh_connect(ssh_session session) {
return SSH_ERROR; return SSH_ERROR;
} }
if (session->fd != -1) { if (session->fd != SSH_INVALID_SOCKET) {
fd = session->fd; fd = session->fd;
#ifndef _WIN32 #ifndef _WIN32
} else if (session->ProxyCommand != NULL) { } else if (session->ProxyCommand != NULL) {
@@ -522,7 +522,7 @@ int ssh_connect(ssh_session session) {
fd = ssh_connect_host(session, session->host, session->bindaddr, fd = ssh_connect_host(session, session->host, session->bindaddr,
session->port, session->timeout, session->timeout_usec); session->port, session->timeout, session->timeout_usec);
} }
if (fd < 0) { if (fd == SSH_INVALID_SOCKET) {
leave_function(); leave_function();
return SSH_ERROR; return SSH_ERROR;
} }