Fix s_client and s_server so that they correctly handle the DTLS timer

[openssl.git] / apps / s_client.c

diff --git a/apps/s_client.c b/apps/s_client.c
index 9d463f6d81c093e03f3520a9e63bb3c1e5ad03ff..96f9da698593baa4a4c9281bc528dc2e165f0dc6 100644 (file)
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -2703,8 +2703,7 @@ int s_client_main(int argc, char **argv)
         FD_ZERO(&readfds);
         FD_ZERO(&writefds);
 
         FD_ZERO(&readfds);
         FD_ZERO(&writefds);
 

-        if ((SSL_version(con) == DTLS1_VERSION) &&
-            DTLSv1_get_timeout(con, &timeout))
+        if (SSL_is_dtls(con) && DTLSv1_get_timeout(con, &timeout))

             timeoutp = &timeout;
         else
             timeoutp = NULL;
             timeoutp = &timeout;
         else
             timeoutp = NULL;


@@ -2815,10 +2814,8 @@ int s_client_main(int argc, char **argv)
             }
         }
 
             }
         }
 

-        if ((SSL_version(con) == DTLS1_VERSION)
-            && DTLSv1_handle_timeout(con) > 0) {
+        if (SSL_is_dtls(con) && DTLSv1_handle_timeout(con) > 0)

             BIO_printf(bio_err, "TIMEOUT occurred\n");
             BIO_printf(bio_err, "TIMEOUT occurred\n");

-        }

 
         if (!ssl_pending && FD_ISSET(SSL_get_fd(con), &writefds)) {
             k = SSL_write(con, &(cbuf[cbuf_off]), (unsigned int)cbuf_len);
 
         if (!ssl_pending && FD_ISSET(SSL_get_fd(con), &writefds)) {
             k = SSL_write(con, &(cbuf[cbuf_off]), (unsigned int)cbuf_len);