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 | |
parent | e7009fe8f3928db009f5d03ff47bd159599e5440 (diff) | |
download | libssh-c2686b8febf2c57761cfa9e47c8dc533f84d1cb2.tar.gz libssh-c2686b8febf2c57761cfa9e47c8dc533f84d1cb2.tar.xz libssh-c2686b8febf2c57761cfa9e47c8dc533f84d1cb2.zip |
socket: Move socket function to right location.
-rw-r--r-- | include/libssh/priv.h | 2 | ||||
-rw-r--r-- | include/libssh/socket.h | 2 | ||||
-rw-r--r-- | src/connect.c | 26 | ||||
-rw-r--r-- | src/socket.c | 23 |
4 files changed, 27 insertions, 26 deletions
diff --git a/include/libssh/priv.h b/include/libssh/priv.h index bd45757..6d8eeb4 100644 --- a/include/libssh/priv.h +++ b/include/libssh/priv.h @@ -206,8 +206,6 @@ socket_t ssh_connect_host(ssh_session session, const char *host,const char *bind_addr, int port, long timeout, long usec); socket_t ssh_connect_host_nonblocking(ssh_session session, const char *host, const char *bind_addr, int port); -void ssh_sock_set_nonblocking(socket_t sock); -void ssh_sock_set_blocking(socket_t sock); /* in base64.c */ ssh_buffer base64_to_bin(const char *source); diff --git a/include/libssh/socket.h b/include/libssh/socket.h index 527f52e..29ded35 100644 --- a/include/libssh/socket.h +++ b/include/libssh/socket.h @@ -56,6 +56,8 @@ int ssh_socket_get_status(ssh_socket s); int ssh_socket_buffered_write_bytes(ssh_socket s); int ssh_socket_data_available(ssh_socket s); int ssh_socket_data_writable(ssh_socket s); +void ssh_socket_set_nonblocking(socket_t fd); +void ssh_socket_set_blocking(socket_t fd); void ssh_socket_set_callbacks(ssh_socket s, ssh_socket_callbacks callbacks); int ssh_socket_pollcallback(struct ssh_poll_handle_struct *p, socket_t fd, int revents, void *v_s); diff --git a/src/connect.c b/src/connect.c index 963971c..a47c652 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; diff --git a/src/socket.c b/src/socket.c index a4a16b1..5bde836 100644 --- a/src/socket.c +++ b/src/socket.c @@ -300,7 +300,7 @@ int ssh_socket_pollcallback(struct ssh_poll_handle_struct *p, socket_t fd, int r ssh_log(s->session,SSH_LOG_PACKET,"Received POLLOUT in connecting state"); s->state = SSH_SOCKET_CONNECTED; ssh_poll_set_events(p,POLLOUT | POLLIN); - ssh_sock_set_blocking(ssh_socket_get_fd_in(s)); + ssh_socket_set_blocking(ssh_socket_get_fd_in(s)); if(s->callbacks && s->callbacks->connected) s->callbacks->connected(SSH_SOCKET_CONNECTED_OK,0,s->callbacks->userdata); return 0; @@ -701,6 +701,27 @@ int ssh_socket_get_status(ssh_socket s) { return r; } +#ifdef _WIN32 +void ssh_socket_set_nonblocking(socket_t fd) { + u_long nonblocking = 1; + ioctlsocket(fd, FIONBIO, &nonblocking); +} + +void ssh_socket_set_blocking(socket_t fd) { + u_long nonblocking = 0; + ioctlsocket(fd, FIONBIO, &nonblocking); +} + +#else /* _WIN32 */ +void ssh_socket_set_nonblocking(socket_t fd) { + fcntl(fd, F_SETFL, O_NONBLOCK); +} + +void ssh_socket_set_blocking(socket_t fd) { + fcntl(fd, F_SETFL, 0); +} +#endif /* _WIN32 */ + /** * @internal * @brief Launches a socket connection |