[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU gnutls branch, master, updated. gnutls_3_1_0-114-g98b8855
From: |
Nikos Mavrogiannopoulos |
Subject: |
[SCM] GNU gnutls branch, master, updated. gnutls_3_1_0-114-g98b8855 |
Date: |
Fri, 21 Sep 2012 07:18:00 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".
http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=98b8855f666b7d8691e877795424e9d75c3b36eb
The branch, master has been updated
via 98b8855f666b7d8691e877795424e9d75c3b36eb (commit)
via da4a5c64a11e7f0a0e419e5104693042359cc717 (commit)
from 2aba5415bb6d409afa305cbc7a15670b245f9981 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 98b8855f666b7d8691e877795424e9d75c3b36eb
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Fri Sep 21 09:16:57 2012 +0200
Allow for pinging until timeout.
commit da4a5c64a11e7f0a0e419e5104693042359cc717
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Fri Sep 21 09:15:14 2012 +0200
corrected time
-----------------------------------------------------------------------
Summary of changes:
lib/ext/heartbeat.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/ext/heartbeat.c b/lib/ext/heartbeat.c
index 376cb31..d71e694 100644
--- a/lib/ext/heartbeat.c
+++ b/lib/ext/heartbeat.c
@@ -158,7 +158,7 @@ heartbeat_send_data (gnutls_session_t session, const void
*data,
* gnutls_heartbeat_ping:
* @session: is a #gnutls_session_t structure.
* @data_size: is the length of the ping payload.
- * @max_tries: if flags is %GNUTLS_HEARTBEAT_WAIT then this sets the number of
retransmissions.
+ * @max_tries: if flags is %GNUTLS_HEARTBEAT_WAIT then this sets the number of
retransmissions. Use zero for indefinite (until timeout).
* @flags: if %GNUTLS_HEARTBEAT_WAIT then wait for pong or timeout instead of
returning immediately.
*
* This function sends a ping to the peer. If the @flags is set
@@ -234,12 +234,13 @@ retry:
else if (ret == GNUTLS_E_TIMEDOUT)
{
retries++;
- if (retries > max_tries)
+ if (max_tries > 0 && retries > max_tries)
{
session->internals.hb_state = SHB_SEND1;
return gnutls_assert_val(ret);
}
+ gettime(&now);
diff = _dtls_timespec_sub_ms(&now,
&session->internals.hb_ping_start);
if (diff > session->internals.hb_total_timeout_ms)
{
hooks/post-receive
--
GNU gnutls
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU gnutls branch, master, updated. gnutls_3_1_0-114-g98b8855,
Nikos Mavrogiannopoulos <=