From 09b0018b938bfbbe0d5b5363b8e011aa7bfbf2f2 Mon Sep 17 00:00:00 2001 From: Aris Adamantiadis Date: Tue, 24 May 2011 23:26:18 +0200 Subject: Introduced ssh_timeout_elapsed functions Functions to mesure elapsed time before and after a serie of calls. Introduces a dependancy to clock_gettime() and librt, hope this doesn't break anything. Porting to gettimeofday() should not be too hard. (cherry picked from commit 59f7647cd97c62ab7a26725e5a166dcb54b27bc6) --- src/poll.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/poll.c') diff --git a/src/poll.c b/src/poll.c index e5a11d95..e5ab16c0 100644 --- a/src/poll.c +++ b/src/poll.c @@ -585,6 +585,7 @@ void ssh_poll_ctx_remove(ssh_poll_ctx ctx, ssh_poll_handle p) { * the poll() function. * @returns SSH_OK No error. * SSH_ERROR Error happened during the poll. + * SSH_AGAIN Timeout occured */ int ssh_poll_ctx_dopoll(ssh_poll_ctx ctx, int timeout) { @@ -598,8 +599,10 @@ int ssh_poll_ctx_dopoll(ssh_poll_ctx ctx, int timeout) { return 0; rc = ssh_poll(ctx->pollfds, ctx->polls_used, timeout); - if(rc <= 0) + if(rc < 0) return SSH_ERROR; + if (rc == 0) + return SSH_AGAIN; used = ctx->polls_used; for (i = 0; i < used && rc > 0; ) { if (!ctx->pollfds[i].revents) { -- cgit