client: Fix another source of endless wait.

(cherry picked from commit 35686b4822c8a18d1d6715221be91ee67e563bad)

2 files changed, 15 insertions, 13 deletions

diff --git a/src/auth.c b/src/auth.c
index af699918..6dda4792 100644
--- a/src/auth.c
+++ b/src/auth.c
@@ -254,7 +254,7 @@ static int wait_auth_status(ssh_session session) {
   enter_function();
 
   if(ssh_is_blocking(session)){
-    if(ssh_handle_packets_termination(session,-1,auth_status_termination,
+    if(ssh_handle_packets_termination(session, -2, auth_status_termination,
         session) == SSH_ERROR){
       leave_function();
       return SSH_AUTH_ERROR;
diff --git a/src/client.c b/src/client.c
index 84a0ad92..df8f08e4 100644
--- a/src/client.c
+++ b/src/client.c
@@ -684,19 +684,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();