aboutsummaryrefslogtreecommitdiff
path: root/src/misc.c
diff options
context:
space:
mode:
authorrofl0r <retnyg@gmx.net>2011-08-06 10:51:57 +0200
committerAndreas Schneider <asn@cryptomilk.org>2011-08-06 11:08:38 +0200
commitc31cac93f3695b81383e65ecc8206fbda7f75d94 (patch)
treeadc25991c5e26f43fcd40f88ba9ffd0d92b55900 /src/misc.c
parenta290fe33c1d730f5e113379fc3e74490f2320094 (diff)
downloadlibssh-c31cac93f3695b81383e65ecc8206fbda7f75d94.tar.gz
libssh-c31cac93f3695b81383e65ecc8206fbda7f75d94.tar.xz
libssh-c31cac93f3695b81383e65ecc8206fbda7f75d94.zip
misc: Fix ssh_timeout_update().
Diffstat (limited to 'src/misc.c')
-rw-r--r--src/misc.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/misc.c b/src/misc.c
index 0e08fa2b..361fc2d3 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -940,15 +940,15 @@ int ssh_timeout_elapsed(struct ssh_timestamp *ts, int timeout) {
* @param[in] ts pointer to an existing timestamp
* @param[in] timeout timeout in milliseconds. Negative values mean infinite
* timeout
- * @returns remaining time in milliseconds, 0 if elapsed, -1 if never.
+ * @returns remaining time in milliseconds, 0 if elapsed, -1 if never,
+ * -2 if option-set-timeout.
*/
int ssh_timeout_update(struct ssh_timestamp *ts, int timeout){
struct ssh_timestamp now;
int ms, ret;
- if(timeout == 0)
- return 0;
- if(timeout==-1)
- return -1;
+ if (timeout <= 0) {
+ return timeout;
+ }
ssh_timestamp_init(&now);
ms = ssh_timestamp_difference(ts,&now);
if(ms < 0)