aboutsummaryrefslogtreecommitdiff
path: root/src/client.c
diff options
context:
space:
mode:
authorrofl0r <retnyg@gmx.net>2011-08-05 10:30:54 +0200
committerAndreas Schneider <asn@cryptomilk.org>2011-08-06 11:12:02 +0200
commit35686b4822c8a18d1d6715221be91ee67e563bad (patch)
treea64446fa2cdf524f4bb6cea701d94366b82a8a75 /src/client.c
parent7ccd9c31b33798824b27e4af095b52b9026a1f98 (diff)
downloadlibssh-35686b4822c8a18d1d6715221be91ee67e563bad.tar.gz
libssh-35686b4822c8a18d1d6715221be91ee67e563bad.tar.xz
libssh-35686b4822c8a18d1d6715221be91ee67e563bad.zip
client: Fix another source of endless wait.
Diffstat (limited to 'src/client.c')
-rw-r--r--src/client.c26
1 files changed, 14 insertions, 12 deletions
diff --git a/src/client.c b/src/client.c
index 78f417c0..4396fb1a 100644
--- a/src/client.c
+++ b/src/client.c
@@ -628,19 +628,21 @@ int ssh_connect(ssh_session session) {
session->alive = 1;
ssh_log(session,SSH_LOG_PROTOCOL,"Socket connecting, now waiting for the callbacks to work");
pending:
- session->pending_call_state=SSH_PENDING_CALL_CONNECT;
- if(ssh_is_blocking(session)) {
- int timeout = session->timeout * 1000 + session->timeout_usec;
- if (timeout <= 0)
- timeout = -1;
- ssh_handle_packets_termination(session,timeout,ssh_connect_termination,session);
- if(!ssh_connect_termination(session)){
- ssh_set_error(session,SSH_FATAL,"Timeout connecting to %s",session->host);
- session->session_state = SSH_SESSION_STATE_ERROR;
- }
- }
+ session->pending_call_state=SSH_PENDING_CALL_CONNECT;
+ if(ssh_is_blocking(session)) {
+ int timeout = (session->timeout * 1000) + (session->timeout_usec / 1000);
+ if (timeout == 0) {
+ timeout = 10 * 1000;
+ }
+ ssh_log(session,SSH_LOG_PACKET,"ssh_connect: Actual timeout : %d", timeout);
+ ssh_handle_packets_termination(session, timeout, ssh_connect_termination, session);
+ if(!ssh_connect_termination(session)){
+ ssh_set_error(session,SSH_FATAL,"Timeout connecting to %s",session->host);
+ session->session_state = SSH_SESSION_STATE_ERROR;
+ }
+ }
else
- ssh_handle_packets_termination(session,0,ssh_connect_termination, session);
+ ssh_handle_packets_termination(session, 0, ssh_connect_termination, session);
ssh_log(session,SSH_LOG_PACKET,"ssh_connect: Actual state : %d",session->session_state);
if(!ssh_is_blocking(session) && !ssh_connect_termination(session)){
leave_function();