session: Fix an infinite loop in the termination callback.

This happened due to the use of the buggy and obsolete timeout
funtions.
(cherry picked from commit 7949f2cdc6eb1ac0f076e06e6a3fa47540a9b870)

1 files changed, 11 insertions, 17 deletions

diff --git a/src/session.c b/src/session.c
index 2975c1a4..4f0ef1e8 100644
--- a/src/session.c
+++ b/src/session.c
@@ -492,23 +492,17 @@ int ssh_handle_packets(ssh_session session, int timeout) {
  * @return              SSH_OK on success, SSH_ERROR otherwise.
  */
 int ssh_handle_packets_termination(ssh_session session, int timeout,
-    ssh_termination_function fct, void *user){
-  int ret = SSH_ERROR;
-  struct ssh_timestamp ts;
-  ssh_timestamp_init(&ts);
-
-  while(!fct(user)){
-    ret = ssh_handle_packets(session, timeout);
-    if(ret == SSH_ERROR)
-      return SSH_ERROR;
-    if(fct(user)) {
-      return SSH_OK;
-    } else if (ssh_timeout_elapsed(&ts, timeout)) {
-      return SSH_AGAIN;
-    }
-    timeout = ssh_timeout_update(&ts,timeout);
-  }
-  return ret;
+	ssh_termination_function fct, void *user){
+	int ret = SSH_OK;
+
+	while(!fct(user)){
+		ret = ssh_handle_packets(session, timeout);
+		if(ret == SSH_ERROR || ret == SSH_AGAIN)
+			return ret;
+		if(fct(user)) 
+			return SSH_OK;
+	}
+	return ret;
 }
 
 /**