diff options
| author | steve <steve> | 2012-03-09 15:52:33 +0000 |
|---|---|---|
| committer | steve <steve> | 2012-03-09 15:52:33 +0000 |
| commit | 09433c4c99fd242332c52efe4c62b1a9fd048edc (patch) | |
| tree | 0d17e68d98dc0ec2d0fd7f20ee7be2241834fd94 /ssl/d1_pkt.c | |
| parent | 915b548a8609f35ecb1f6d999a064043dce1a7b3 (diff) | |
| download | openssl-09433c4c99fd242332c52efe4c62b1a9fd048edc.tar.gz | |
PR: 2756
Submitted by: Robin Seggelmann <seggelmann@fh-muenster.de>
Fix DTLS timeout handling.
Diffstat (limited to 'ssl/d1_pkt.c')
| -rw-r--r-- | ssl/d1_pkt.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/ssl/d1_pkt.c b/ssl/d1_pkt.c index 4dc091a20..987af6083 100644 --- a/ssl/d1_pkt.c +++ b/ssl/d1_pkt.c @@ -179,7 +179,6 @@ static int dtls1_record_needs_buffering(SSL *s, SSL3_RECORD *rr, static int dtls1_buffer_record(SSL *s, record_pqueue *q, unsigned char *priority); static int dtls1_process_record(SSL *s); -static void dtls1_clear_timeouts(SSL *s); /* copy buffered record into SSL structure */ static int @@ -698,7 +697,6 @@ again: goto again; /* get another record */ } - dtls1_clear_timeouts(s); /* done waiting */ return(1); } @@ -1250,6 +1248,9 @@ start: */ if (msg_hdr.type == SSL3_MT_FINISHED) { + if (dtls1_check_timeout_num(s) < 0) + return -1; + dtls1_retransmit_buffered_messages(s); rr->length = 0; goto start; @@ -1873,10 +1874,3 @@ dtls1_reset_seq_numbers(SSL *s, int rw) memset(seq, 0x00, seq_bytes); } - - -static void -dtls1_clear_timeouts(SSL *s) - { - memset(&(s->d1->timeout), 0x00, sizeof(struct dtls1_timeout_st)); - } |