diff options
author | Andreas Schneider <asn@cryptomilk.org> | 2011-09-17 18:58:30 +0200 |
---|---|---|
committer | Andreas Schneider <asn@cryptomilk.org> | 2011-09-18 21:37:17 +0200 |
commit | c2686b8febf2c57761cfa9e47c8dc533f84d1cb2 (patch) | |
tree | 9a5382c6a2a2c253da279a824d696ad2cdc61579 /src/connect.c | |
parent | e7009fe8f3928db009f5d03ff47bd159599e5440 (diff) | |
download | libssh-c2686b8febf2c57761cfa9e47c8dc533f84d1cb2.tar.gz libssh-c2686b8febf2c57761cfa9e47c8dc533f84d1cb2.tar.xz libssh-c2686b8febf2c57761cfa9e47c8dc533f84d1cb2.zip |
socket: Move socket function to right location.
Diffstat (limited to 'src/connect.c')
-rw-r--r-- | src/connect.c | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/src/connect.c b/src/connect.c index 963971c8..a47c652c 100644 --- a/src/connect.c +++ b/src/connect.c @@ -84,16 +84,6 @@ #endif #ifdef _WIN32 -void ssh_sock_set_nonblocking(socket_t sock) { - u_long nonblocking = 1; - ioctlsocket(sock, FIONBIO, &nonblocking); -} - -void ssh_sock_set_blocking(socket_t sock) { - u_long nonblocking = 0; - ioctlsocket(sock, FIONBIO, &nonblocking); -} - #ifndef gai_strerror char WSAAPI *gai_strerrorA(int code) { static char buf[256]; @@ -103,16 +93,6 @@ char WSAAPI *gai_strerrorA(int code) { return buf; } #endif /* gai_strerror */ - -#else /* _WIN32 */ -void ssh_sock_set_nonblocking(socket_t sock) { - fcntl(sock, F_SETFL, O_NONBLOCK); -} - -void ssh_sock_set_blocking(socket_t sock) { - fcntl(sock, F_SETFL, 0); -} - #endif /* _WIN32 */ static int ssh_connect_socket_close(socket_t s){ @@ -168,7 +148,7 @@ static int ssh_connect_ai_timeout(ssh_session session, const char *host, */ timeout_ms=timeout * 1000 + usec / 1000; - ssh_sock_set_nonblocking(s); + ssh_socket_set_nonblocking(s); ssh_log(session, SSH_LOG_RARE, "Trying to connect to host: %s:%d with " "timeout %d ms", host, port, timeout_ms); @@ -215,7 +195,7 @@ static int ssh_connect_ai_timeout(ssh_session session, const char *host, /* s is connected ? */ ssh_log(session, SSH_LOG_PACKET, "Socket connected with timeout\n"); - ssh_sock_set_blocking(s); + ssh_socket_set_blocking(s); leave_function(); return s; @@ -385,7 +365,7 @@ socket_t ssh_connect_host_nonblocking(ssh_session session, const char *host, continue; } } - ssh_sock_set_nonblocking(s); + ssh_socket_set_nonblocking(s); connect(s, itr->ai_addr, itr->ai_addrlen); break; |