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

Non-blocking mode for ssh_connect

Browse Source 
This looks ugly. I'll see if we need to revert or change that patch later.
This commit is contained in:
Aris Adamantiadis
2011-01-10 18:01:35 +01:00
parent bcea8921ba
commit 9140242cbe
2 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/libssh/session.h
View File

@@ -51,6 +51,10 @@ enum ssh_dh_state_e {
DH_STATE_FINISHED DH_STATE_FINISHED
}; };
enum ssh_pending_call_e {
SSH_PENDING_CALL_NONE = 0,
SSH_PENDING_CALL_CONNECT
};
/* libssh calls may block an undefined amount of time */ /* libssh calls may block an undefined amount of time */
#define SSH_SESSION_FLAG_BLOCKING 1 #define SSH_SESSION_FLAG_BLOCKING 1
@@ -89,6 +93,7 @@ struct ssh_session_struct {
/* the states are used by the nonblocking stuff to remember */ /* the states are used by the nonblocking stuff to remember */
/* where it was before being interrupted */ /* where it was before being interrupted */
enum ssh_pending_call_e pending_call_state;
enum ssh_session_state_e session_state; enum ssh_session_state_e session_state;
int packet_state; int packet_state;
enum ssh_dh_state_e dh_handshake_state; enum ssh_dh_state_e dh_handshake_state;

25
src/client.c
View File

@@ -594,6 +594,8 @@ static void ssh_client_connection_callback(ssh_session session){
* @param[in] session The ssh session to connect. * @param[in] session The ssh session to connect.
* *
* @returns SSH_OK on success, SSH_ERROR on error. * @returns SSH_OK on success, SSH_ERROR on error.
* @returns SSH_AGAIN, if the session is in nonblocking mode,
* and call must be done again.
* *
* @see ssh_new() * @see ssh_new()
* @see ssh_disconnect() * @see ssh_disconnect()
@@ -607,7 +609,16 @@ int ssh_connect(ssh_session session) {
} }
enter_function(); enter_function();
switch(session->pending_call_state){
case SSH_PENDING_CALL_NONE:
break;
case SSH_PENDING_CALL_CONNECT:
goto pending;
default:
ssh_set_error(session,SSH_FATAL,"Bad call during pending SSH call in ssh_connect");
leave_function();
return SSH_ERROR;
}
session->alive = 0; session->alive = 0;
session->client = 1; session->client = 1;
@@ -657,15 +668,25 @@ int ssh_connect(ssh_session session) {
session->alive = 1; session->alive = 1;
ssh_log(session,SSH_LOG_PROTOCOL,"Socket connecting, now waiting for the callbacks to work"); ssh_log(session,SSH_LOG_PROTOCOL,"Socket connecting, now waiting for the callbacks to work");
pending:
session->pending_call_state=SSH_PENDING_CALL_CONNECT;
while(session->session_state != SSH_SESSION_STATE_ERROR && while(session->session_state != SSH_SESSION_STATE_ERROR &&
session->session_state != SSH_SESSION_STATE_AUTHENTICATING && session->session_state != SSH_SESSION_STATE_AUTHENTICATING &&
session->session_state != SSH_SESSION_STATE_DISCONNECTED){ session->session_state != SSH_SESSION_STATE_DISCONNECTED){
/* loop until SSH_SESSION_STATE_BANNER_RECEIVED or /* loop until SSH_SESSION_STATE_BANNER_RECEIVED or
* SSH_SESSION_STATE_ERROR */ * SSH_SESSION_STATE_ERROR */
ssh_handle_packets(session,-1); if(ssh_is_blocking(session))
ssh_handle_packets(session,-1);
else
ssh_handle_packets(session,0);
ssh_log(session,SSH_LOG_PACKET,"ssh_connect: Actual state : %d",session->session_state); ssh_log(session,SSH_LOG_PACKET,"ssh_connect: Actual state : %d",session->session_state);
if(!ssh_is_blocking(session)){
leave_function();
return SSH_AGAIN;
}
} }
leave_function(); leave_function();
session->pending_call_state=SSH_PENDING_CALL_NONE;
if(session->session_state == SSH_SESSION_STATE_ERROR || session->session_state == SSH_SESSION_STATE_DISCONNECTED) if(session->session_state == SSH_SESSION_STATE_ERROR || session->session_state == SSH_SESSION_STATE_DISCONNECTED)
return SSH_ERROR; return SSH_ERROR;
return SSH_OK; return SSH_OK;