From 0315b378f57c2fcde66eb2feac35168df2cc22cb Mon Sep 17 00:00:00 2001 From: John Safranek Date: Wed, 23 May 2018 16:07:45 -0700 Subject: [PATCH] Fix TCP with Timeout Updated example client and server to use the new wolfSSL_dtls_set_using_nonblock() function. --- examples/client/client.c | 12 ++++++++++-- examples/server/server.c | 6 +++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/examples/client/client.c b/examples/client/client.c index 018b91e7c..ba048b1af 100644 --- a/examples/client/client.c +++ b/examples/client/client.c @@ -2075,7 +2075,11 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) wolfSSL_check_domain_name(ssl, domain); #ifndef WOLFSSL_CALLBACKS if (nonBlocking) { - wolfSSL_set_using_nonblock(ssl, 1); +#ifdef WOLFSSL_DTLS + if (doDTLS) { + wolfSSL_dtls_set_using_nonblock(ssl, 1); + } +#endif tcp_set_nonblocking(&sockfd); ret = NonBlockingSSL_Connect(ssl); } @@ -2328,7 +2332,11 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) #ifndef WOLFSSL_CALLBACKS if (nonBlocking) { - wolfSSL_set_using_nonblock(sslResume, 1); +#ifdef WOLFSSL_DTLS + if (doDTLS) { + wolfSSL_dtls_set_using_nonblock(ssl, 1); + } +#endif tcp_set_nonblocking(&sockfd); ret = NonBlockingSSL_Connect(sslResume); } diff --git a/examples/server/server.c b/examples/server/server.c index 0a44095ed..f31cf3b24 100644 --- a/examples/server/server.c +++ b/examples/server/server.c @@ -1426,7 +1426,11 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args) #ifndef CYASSL_CALLBACKS if (nonBlocking) { - CyaSSL_set_using_nonblock(ssl, 1); +#ifdef WOLFSSL_DTLS + if (doDTLS) { + wolfSSL_dtls_set_using_nonblock(ssl, 1); + } +#endif tcp_set_nonblocking(&clientfd); } #endif