commit 0190bc3bcce2e9a667f45d8a81888bbad5f0f82c
author Michal Vasko <mvasko@cesnet.cz> Wed Mar 02 15:47:49 2016 +0100
committer Michal Vasko <mvasko@cesnet.cz> Wed Mar 02 15:47:49 2016 +0100
tree b803c77538e9a17fef1f8affc7785a6dbff2a6be
parent 6b7c42eba6e230b96293e0d84107dff2bc5cd594

session CHANGE make all the communication non-blocking

For all the timeouts to make sense.

src/session_server_tls.c

diff --git a/src/session_server_tls.c b/src/session_server_tls.c
index ac30210..a905089 100644
--- a/src/session_server_tls.c
+++ b/src/session_server_tls.c
@@ -1516,10 +1516,10 @@
 }
 
 int
-nc_accept_tls_session(struct nc_session *session, int sock)
+nc_accept_tls_session(struct nc_session *session, int sock, int timeout)
 {
     struct nc_server_tls_opts *opts;
-    int ret;
+    int ret, elapsed_usec = 0;
 
     opts = session->data;
 
@@ -1539,7 +1539,14 @@
     pthread_once(&verify_once, nc_tls_make_verify_key);
     pthread_setspecific(verify_key, session);
 
-    ret = SSL_accept(session->ti.tls);
+    while (((ret = SSL_accept(session->ti.tls)) == -1) && (SSL_get_error(session->ti.tls, ret) == SSL_ERROR_WANT_READ)) {
+        usleep(NC_TIMEOUT_STEP);
+        elapsed_usec += NC_TIMEOUT_STEP;
+        if ((timeout > -1) && (elapsed_usec / 1000 >= timeout)) {
+            ERR("SSL_accept timeout.");
+            return 0;
+        }
+    }
 
     if (ret != 1) {
         switch (SSL_get_error(session->ti.tls, ret)) {