feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

add dtls recv timeout max user setting too

Browse Source
This commit is contained in:
toddouska
2013-05-08 12:49:55 -07:00
parent 8cb5f6d5d4
commit 47b468d14f
6 changed files with 51 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cyassl/internal.h
View File

@ -1671,6 +1671,7 @@ struct CYASSL {
#endif #endif
#ifdef CYASSL_DTLS #ifdef CYASSL_DTLS
int dtls_timeout_init; /* starting timeout vaule */ int dtls_timeout_init; /* starting timeout vaule */
int dtls_timeout_max; /* maximum timeout value */
int dtls_timeout; /* current timeout value, changes */ int dtls_timeout; /* current timeout value, changes */
DtlsPool* dtls_pool; DtlsPool* dtls_pool;
DtlsMsg* dtls_msg_list; DtlsMsg* dtls_msg_list;

1
cyassl/ssl.h
View File

@ -255,6 +255,7 @@ CYASSL_API int CyaSSL_set_cipher_list(CYASSL*, const char*);
/* Nonblocking DTLS helper functions */ /* Nonblocking DTLS helper functions */
CYASSL_API int CyaSSL_dtls_get_current_timeout(CYASSL* ssl); CYASSL_API int CyaSSL_dtls_get_current_timeout(CYASSL* ssl);
CYASSL_API int CyaSSL_dtls_set_timeout_init(CYASSL* ssl, int); CYASSL_API int CyaSSL_dtls_set_timeout_init(CYASSL* ssl, int);
CYASSL_API int CyaSSL_dtls_set_timeout_max(CYASSL* ssl, int);
CYASSL_API int CyaSSL_dtls_got_timeout(CYASSL* ssl); CYASSL_API int CyaSSL_dtls_got_timeout(CYASSL* ssl);
CYASSL_API int CyaSSL_dtls(CYASSL* ssl); CYASSL_API int CyaSSL_dtls(CYASSL* ssl);

21
examples/client/client.c
View File

@ -56,16 +56,17 @@ static void NonBlockingSSL_Connect(CYASSL* ssl)
while (ret != SSL_SUCCESS && (error == SSL_ERROR_WANT_READ || while (ret != SSL_SUCCESS && (error == SSL_ERROR_WANT_READ ||
error == SSL_ERROR_WANT_WRITE)) { error == SSL_ERROR_WANT_WRITE)) {
int currTimeout = 1;
if (error == SSL_ERROR_WANT_READ) if (error == SSL_ERROR_WANT_READ)
printf("... client would read block\n"); printf("... client would read block\n");
else else
printf("... client would write block\n"); printf("... client would write block\n");
if (CyaSSL_dtls(ssl)) #ifdef CYASSL_DTLS
select_ret = tcp_select(sockfd, currTimeout = CyaSSL_dtls_get_current_timeout(ssl);
CyaSSL_dtls_get_current_timeout(ssl)); #endif
else select_ret = tcp_select(sockfd, currTimeout);
select_ret = tcp_select(sockfd, 1);
if ((select_ret == TEST_RECV_READY) || if ((select_ret == TEST_RECV_READY) ||
(select_ret == TEST_ERROR_READY)) { (select_ret == TEST_ERROR_READY)) {
@ -76,11 +77,15 @@ static void NonBlockingSSL_Connect(CYASSL* ssl)
#endif #endif
error = CyaSSL_get_error(ssl, 0); error = CyaSSL_get_error(ssl, 0);
} }
else if (select_ret == TEST_TIMEOUT && else if (select_ret == TEST_TIMEOUT && !CyaSSL_dtls(ssl)) {
(!CyaSSL_dtls(ssl) ||
(CyaSSL_dtls_got_timeout(ssl) >= 0))) {
error = SSL_ERROR_WANT_READ; error = SSL_ERROR_WANT_READ;
} }
#ifdef CYASSL_DTLS
else if (select_ret == TEST_TIMEOUT && CyaSSL_dtls(ssl) &&
CyaSSL_dtls_got_timeout(ssl) >= 0) {
error = SSL_ERROR_WANT_READ;
}
#endif
else { else {
error = SSL_FATAL_ERROR; error = SSL_FATAL_ERROR;
} }

21
examples/server/server.c
View File

@ -55,16 +55,17 @@ static void NonBlockingSSL_Accept(SSL* ssl)
while (ret != SSL_SUCCESS && (error == SSL_ERROR_WANT_READ || while (ret != SSL_SUCCESS && (error == SSL_ERROR_WANT_READ ||
error == SSL_ERROR_WANT_WRITE)) { error == SSL_ERROR_WANT_WRITE)) {
int currTimeout = 1;
if (error == SSL_ERROR_WANT_READ) if (error == SSL_ERROR_WANT_READ)
printf("... server would read block\n"); printf("... server would read block\n");
else else
printf("... server would write block\n"); printf("... server would write block\n");
if (CyaSSL_dtls(ssl)) #ifdef CYASSL_DTLS
select_ret = tcp_select(sockfd, currTimeout = CyaSSL_dtls_get_current_timeout(ssl);
CyaSSL_dtls_get_current_timeout(ssl)); #endif
else select_ret = tcp_select(sockfd, currTimeout);
select_ret = tcp_select(sockfd, 1);
if ((select_ret == TEST_RECV_READY) || if ((select_ret == TEST_RECV_READY) ||
(select_ret == TEST_ERROR_READY)) { (select_ret == TEST_ERROR_READY)) {
@ -76,11 +77,15 @@ static void NonBlockingSSL_Accept(SSL* ssl)
#endif #endif
error = SSL_get_error(ssl, 0); error = SSL_get_error(ssl, 0);
} }
else if (select_ret == TEST_TIMEOUT && else if (select_ret == TEST_TIMEOUT && !CyaSSL_dtls(ssl)) {
(!CyaSSL_dtls(ssl) ||
(CyaSSL_dtls_got_timeout(ssl) >= 0))) {
error = SSL_ERROR_WANT_READ; error = SSL_ERROR_WANT_READ;
} }
#ifdef CYASSL_DTLS
else if (select_ret == TEST_TIMEOUT && CyaSSL_dtls(ssl) &&
CyaSSL_dtls_got_timeout(ssl) >= 0) {
error = SSL_ERROR_WANT_READ;
}
#endif
else { else {
error = SSL_FATAL_ERROR; error = SSL_FATAL_ERROR;
} }

3
src/internal.c
View File

@ -1347,6 +1347,7 @@ int InitSSL(CYASSL* ssl, CYASSL_CTX* ctx)
ssl->keys.dtls_peer_epoch = 0; ssl->keys.dtls_peer_epoch = 0;
ssl->keys.dtls_expected_peer_epoch = 0; ssl->keys.dtls_expected_peer_epoch = 0;
ssl->dtls_timeout_init = DTLS_TIMEOUT_INIT; ssl->dtls_timeout_init = DTLS_TIMEOUT_INIT;
ssl->dtls_timeout_max = DTLS_TIMEOUT_MAX;
ssl->dtls_timeout = ssl->dtls_timeout_init; ssl->dtls_timeout = ssl->dtls_timeout_init;
ssl->dtls_pool = NULL; ssl->dtls_pool = NULL;
ssl->dtls_msg_list = NULL; ssl->dtls_msg_list = NULL;
@ -1806,7 +1807,7 @@ void DtlsPoolReset(CYASSL* ssl)
int DtlsPoolTimeout(CYASSL* ssl) int DtlsPoolTimeout(CYASSL* ssl)
{ {
int result = -1; int result = -1;
if (ssl->dtls_timeout < DTLS_TIMEOUT_MAX) { if (ssl->dtls_timeout < ssl->dtls_timeout_max) {
ssl->dtls_timeout *= DTLS_TIMEOUT_MULTIPLIER; ssl->dtls_timeout *= DTLS_TIMEOUT_MULTIPLIER;
result = 0; result = 0;
} }

35
src/ssl.c
View File

@ -3532,16 +3532,13 @@ int CyaSSL_set_cipher_list(CYASSL* ssl, const char* list)
#ifndef CYASSL_LEANPSK #ifndef CYASSL_LEANPSK
#ifdef CYASSL_DTLS
int CyaSSL_dtls_get_current_timeout(CYASSL* ssl) int CyaSSL_dtls_get_current_timeout(CYASSL* ssl)
{ {
(void)ssl; (void)ssl;
#ifdef CYASSL_DTLS
return ssl->dtls_timeout; return ssl->dtls_timeout;
#else
return NOT_COMPILED_IN;
#endif
} }
@ -3551,33 +3548,43 @@ int CyaSSL_dtls_set_timeout_init(CYASSL* ssl, int timeout)
if (ssl == NULL || timeout < 0) if (ssl == NULL || timeout < 0)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
#ifdef CYASSL_DTLS
ssl->dtls_timeout_init = timeout; ssl->dtls_timeout_init = timeout;
return SSL_SUCCESS; return SSL_SUCCESS;
#else }
return NOT_COMPILED_IN;
#endif
/* user may need to alter max dtls recv timeout, SSL_SUCCESS on ok */
int CyaSSL_dtls_set_timeout_max(CYASSL* ssl, int timeout)
{
if (ssl == NULL || timeout < 0)
return BAD_FUNC_ARG;
if (ssl->dtls_timeout_max < ssl->dtls_timeout_init) {
CYASSL_MSG("Can't set dtls timeout max less than dtls timeout init");
return BAD_FUNC_ARG;
}
ssl->dtls_timeout_max = timeout;
return SSL_SUCCESS;
} }
int CyaSSL_dtls_got_timeout(CYASSL* ssl) int CyaSSL_dtls_got_timeout(CYASSL* ssl)
{ {
#ifdef CYASSL_DTLS
int result = SSL_SUCCESS; int result = SSL_SUCCESS;
DtlsMsgListDelete(ssl->dtls_msg_list, ssl->heap); DtlsMsgListDelete(ssl->dtls_msg_list, ssl->heap);
ssl->dtls_msg_list = NULL; ssl->dtls_msg_list = NULL;
if (DtlsPoolTimeout(ssl) < 0 || DtlsPoolSend(ssl) < 0) { if (DtlsPoolTimeout(ssl) < 0 || DtlsPoolSend(ssl) < 0) {
result = SSL_FATAL_ERROR; result = SSL_FATAL_ERROR;
} }
return result; return result;
#else
(void)ssl;
return NOT_COMPILED_IN;
#endif
} }
#endif #endif /* DTLS */
#endif /* LEANPSK */
/* client only parts */ /* client only parts */