mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-02-17 14:32:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

dtls: code cleanup and refactorization

Browse Source 
- factorize BIO_CTRL_DGRAM_SET_NEXT_TIMEOUT calls.
- simplify a return type
- style nits

Reviewed-by: Todd Short <todd.short@me.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20602)
This commit is contained in:
FdaSilvaYY 2021-02-21 00:04:07 +01:00 committed by Tomas Mraz
parent 09ff84bd27
commit 24a3225443
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ssl/d1_lib.c
View File

@ -225,7 +225,7 @@ long dtls1_ctrl(SSL *ssl, int cmd, long larg, void *parg)
switch (cmd) {
case DTLS_CTRL_GET_TIMEOUT:
if (dtls1_get_timeout(s, &t) != NULL) {
if (dtls1_get_timeout(s, &t)) {
*(struct timeval *)parg = ossl_time_to_timeval(t);
ret = 1;
}
@ -256,9 +256,15 @@ long dtls1_ctrl(SSL *ssl, int cmd, long larg, void *parg)
return ret;
}
static void dtls1_bio_set_next_timeout(BIO * bio, const DTLS1_STATE *d1)
{
struct timeval tv = ossl_time_to_timeval(d1->next_timeout);
BIO_ctrl(bio, BIO_CTRL_DGRAM_SET_NEXT_TIMEOUT, 0, &tv);
}
void dtls1_start_timer(SSL_CONNECTION *s)
{
struct timeval tv;
OSSL_TIME duration;
SSL *ssl = SSL_CONNECTION_GET_SSL(s);
@ -285,17 +291,17 @@ void dtls1_start_timer(SSL_CONNECTION *s)
duration = ossl_us2time(s->d1->timeout_duration_us);
s->d1->next_timeout = ossl_time_add(ossl_time_now(), duration);
tv = ossl_time_to_timeval(s->d1->next_timeout);
BIO_ctrl(SSL_get_rbio(ssl), BIO_CTRL_DGRAM_SET_NEXT_TIMEOUT, 0, &tv);
/* set s->d1->next_timeout into ssl->rbio interface */
dtls1_bio_set_next_timeout(SSL_get_rbio(ssl), s->d1);
}
OSSL_TIME *dtls1_get_timeout(SSL_CONNECTION *s, OSSL_TIME *timeleft)
int dtls1_get_timeout(const SSL_CONNECTION *s, OSSL_TIME *timeleft)
{
OSSL_TIME timenow;
/* If no timeout is set, just return NULL */
if (ossl_time_is_zero(s->d1->next_timeout))
return NULL;
return 0;
/* Get current time */
timenow = ossl_time_now();
@ -308,7 +314,7 @@ OSSL_TIME *dtls1_get_timeout(SSL_CONNECTION *s, OSSL_TIME *timeleft)
*timeleft = ossl_time_subtract(s->d1->next_timeout, timenow);
if (ossl_time_compare(*timeleft, ossl_ms2time(15)) <= 0)
*timeleft = ossl_time_zero();
return timeleft;
return 1;
}
int dtls1_is_timer_expired(SSL_CONNECTION *s)
@ -316,14 +322,12 @@ int dtls1_is_timer_expired(SSL_CONNECTION *s)
OSSL_TIME timeleft;
/* Get time left until timeout, return false if no timer running */
if (dtls1_get_timeout(s, &timeleft) == NULL) {
if (!dtls1_get_timeout(s, &timeleft))
return 0;
}
/* Return false if timer is not expired yet */
if (!ossl_time_is_zero(timeleft)) {
if (!ossl_time_is_zero(timeleft))
return 0;
}
/* Timer expired, so return true */
return 1;
@ -338,14 +342,11 @@ static void dtls1_double_timeout(SSL_CONNECTION *s)
void dtls1_stop_timer(SSL_CONNECTION *s)
{
struct timeval tv;
/* Reset everything */
s->d1->timeout_num_alerts = 0;
s->d1->next_timeout = ossl_time_zero();
s->d1->timeout_duration_us = 1000000;
tv = ossl_time_to_timeval(s->d1->next_timeout);
BIO_ctrl(s->rbio, BIO_CTRL_DGRAM_SET_NEXT_TIMEOUT, 0, &tv);
dtls1_bio_set_next_timeout(s->rbio, s->d1);
/* Clear retransmission buffer */
dtls1_clear_sent_buffer(s);
}

2
ssl/ssl_local.h
View File

@ -2668,7 +2668,7 @@ void dtls1_clear_sent_buffer(SSL_CONNECTION *s);
void dtls1_get_message_header(const unsigned char *data,
struct hm_header_st *msg_hdr);
__owur OSSL_TIME dtls1_default_timeout(void);
__owur OSSL_TIME *dtls1_get_timeout(SSL_CONNECTION *s, OSSL_TIME *timeleft);
__owur int dtls1_get_timeout(const SSL_CONNECTION *s, OSSL_TIME *timeleft);
__owur int dtls1_check_timeout_num(SSL_CONNECTION *s);
__owur int dtls1_handle_timeout(SSL_CONNECTION *s);
void dtls1_start_timer(SSL_CONNECTION *s);