| commit | 4817504d069b4c5082161b02a22116ad75f822b1 | [log] [tgz] |
|---|---|---|
| author | Dr. Stephen Henson <steve@openssl.org> | Sat Dec 31 22:59:57 2011 +0000 |
| committer | Dr. Stephen Henson <steve@openssl.org> | Sat Dec 31 22:59:57 2011 +0000 |
| tree | 7a85f6af852e34e5b80080b50d80741f6ab36c5a | |
| parent | 84b6e277d4f45487377d0159e82c356d750e1218 [diff] [blame] |
PR: 2658 Submitted by: Robin Seggelmann <seggelmann@fh-muenster.de> Reviewed by: steve Support for TLS/DTLS heartbeats.
diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c index 4999f01..e205b5c 100644 --- a/ssl/d1_lib.c +++ b/ssl/d1_lib.c
@@ -424,6 +424,14 @@ state->timeout.read_timeouts = 1; } +#ifndef OPENSSL_NO_HEARTBEATS + if (s->tlsext_hb_pending) + { + s->tlsext_hb_pending = 0; + return dtls1_heartbeat(s); + } +#endif + dtls1_start_timer(s); return dtls1_retransmit_buffered_messages(s); }