commit f03651217c17d1e8309d3cf5c94a92069adfe152
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Mon Sep 29 16:11:47 2014 +0200
committer Paul Bakker <p.j.bakker@polarssl.org> Tue Oct 21 16:32:42 2014 +0200
tree 5cea32a81c1595d52aaad3589c44d107b0716fa4
parent 7de3c9eecb46acb10138f6e3328c4dd413539101

Adapt programs to use nbio with DTLS

programs/ssl/ssl_client2.c

diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c
index ac87cc2..345274f 100644
--- a/programs/ssl/ssl_client2.c
+++ b/programs/ssl/ssl_client2.c
@@ -946,7 +946,7 @@
     else
         ssl_set_bio_timeout( &ssl, &server_fd, net_send, net_recv,
 #if defined(POLARSSL_HAVE_TIME)
-                             net_recv_timeout,
+                             opt.nbio == 0 ? net_recv_timeout : NULL,
 #else
                              NULL,
 #endif

programs/ssl/ssl_server2.c

diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c
index d70ef4c..7159eb3 100644
--- a/programs/ssl/ssl_server2.c
+++ b/programs/ssl/ssl_server2.c
@@ -1596,7 +1596,7 @@
     else
         ssl_set_bio_timeout( &ssl, &client_fd, net_send, net_recv,
 #if defined(POLARSSL_HAVE_TIME)
-                             net_recv_timeout,
+                             opt.nbio == 0 ? net_recv_timeout : NULL,
 #else
                              NULL,
 #endif