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

Set socket blocking after connexion

Browse Source
This commit is contained in:
Aris Adamantiadis
2010-01-08 23:28:55 +01:00
parent 35532a63fe
commit a2505078da
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/libssh/priv.h
View File

@@ -150,11 +150,13 @@ void ssh_packet_process(ssh_session session, uint8_t type);
/* connect.c */ /* connect.c */
int ssh_regex_init(void); int ssh_regex_init(void);
void ssh_regex_finalize(void); void ssh_regex_finalize(void);
ssh_session ssh_session_new(void);
socket_t ssh_connect_host(ssh_session session, const char *host,const char socket_t ssh_connect_host(ssh_session session, const char *host,const char
*bind_addr, int port, long timeout, long usec); *bind_addr, int port, long timeout, long usec);
socket_t ssh_connect_host_nonblocking(ssh_session session, const char *host, socket_t ssh_connect_host_nonblocking(ssh_session session, const char *host,
const char *bind_addr, int port); const char *bind_addr, int port);
void ssh_sock_set_nonblocking(socket_t sock);
void ssh_sock_set_blocking(socket_t sock);
/* in kex.c */ /* in kex.c */
extern const char *ssh_kex_nums[]; extern const char *ssh_kex_nums[];
int ssh_send_kex(ssh_session session, int server_kex); int ssh_send_kex(ssh_session session, int server_kex);

14
libssh/connect.c
View File

@@ -85,12 +85,12 @@
#endif /* HAVE_REGCOMP */ #endif /* HAVE_REGCOMP */
#ifdef _WIN32 #ifdef _WIN32
static void sock_set_nonblocking(socket_t sock) { static void ssh_sock_set_nonblocking(socket_t sock) {
u_long nonblocking = 1; u_long nonblocking = 1;
ioctlsocket(sock, FIONBIO, &nonblocking); ioctlsocket(sock, FIONBIO, &nonblocking);
} }
static void sock_set_blocking(socket_t sock) { static void ssh_sock_set_blocking(socket_t sock) {
u_long nonblocking = 0; u_long nonblocking = 0;
ioctlsocket(sock, FIONBIO, &nonblocking); ioctlsocket(sock, FIONBIO, &nonblocking);
} }
@@ -106,11 +106,11 @@ char WSAAPI *gai_strerrorA(int code) {
#endif /* gai_strerror */ #endif /* gai_strerror */
#else /* _WIN32 */ #else /* _WIN32 */
static void sock_set_nonblocking(socket_t sock) { void ssh_sock_set_nonblocking(socket_t sock) {
fcntl(sock, F_SETFL, O_NONBLOCK); fcntl(sock, F_SETFL, O_NONBLOCK);
} }
static void sock_set_blocking(socket_t sock) { void ssh_sock_set_blocking(socket_t sock) {
fcntl(sock, F_SETFL, 0); fcntl(sock, F_SETFL, 0);
} }
@@ -212,7 +212,7 @@ static int ssh_connect_ai_timeout(ssh_session session, const char *host,
to.tv_sec = timeout; to.tv_sec = timeout;
to.tv_usec = usec; to.tv_usec = usec;
sock_set_nonblocking(s); ssh_sock_set_nonblocking(s);
ssh_log(session, SSH_LOG_RARE, "Trying to connect to host: %s:%d with " ssh_log(session, SSH_LOG_RARE, "Trying to connect to host: %s:%d with "
"timeout %ld.%ld", host, port, timeout, usec); "timeout %ld.%ld", host, port, timeout, usec);
@@ -255,7 +255,7 @@ static int ssh_connect_ai_timeout(ssh_session session, const char *host,
/* s is connected ? */ /* s is connected ? */
ssh_log(session, SSH_LOG_PACKET, "Socket connected with timeout\n"); ssh_log(session, SSH_LOG_PACKET, "Socket connected with timeout\n");
sock_set_blocking(s); ssh_sock_set_blocking(s);
leave_function(); leave_function();
return s; return s;
@@ -425,7 +425,7 @@ socket_t ssh_connect_host_nonblocking(ssh_session session, const char *host,
continue; continue;
} }
} }
sock_set_nonblocking(s); ssh_sock_set_nonblocking(s);
connect(s, itr->ai_addr, itr->ai_addrlen); connect(s, itr->ai_addr, itr->ai_addrlen);
break; break;

1
libssh/socket.c
View File

@@ -194,6 +194,7 @@ int ssh_socket_pollcallback(ssh_poll_handle p, int fd, int revents, void *v_s){
ssh_log(s->session,SSH_LOG_PACKET,"Received POLLOUT in connecting state"); ssh_log(s->session,SSH_LOG_PACKET,"Received POLLOUT in connecting state");
s->state = SSH_SOCKET_CONNECTED; s->state = SSH_SOCKET_CONNECTED;
ssh_poll_set_events(p,POLLOUT | POLLIN | POLLERR); ssh_poll_set_events(p,POLLOUT | POLLIN | POLLERR);
ssh_sock_set_blocking(ssh_socket_get_fd(s));
if(s->callbacks && s->callbacks->connected) if(s->callbacks && s->callbacks->connected)
s->callbacks->connected(SSH_SOCKET_CONNECTED_OK,0,s->callbacks->userdata); s->callbacks->connected(SSH_SOCKET_CONNECTED_OK,0,s->callbacks->userdata);
return 0; return 0;