GitLab/ocserv
1
0
Fork 0
mirror of https://gitlab.com/openconnect/ocserv.git synced 2026-10-13 18:12:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

use pselect() in worker process as well.

Browse Source
This commit is contained in:
Nikos Mavrogiannopoulos
2014-01-19 04:10:42 +01:00
parent b611537683
commit add57c5d32
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/worker-vpn.c
+17
View File
@@ -979,7 +979,11 @@ static int connect_handler(worker_st * ws)
struct vpn_st vinfo; struct vpn_st vinfo;
unsigned tls_retry, dtls_mtu, cstp_mtu; unsigned tls_retry, dtls_mtu, cstp_mtu;
char *p; char *p;
#ifdef HAVE_PSELECT
struct timespec tv;
#else
struct timeval tv; struct timeval tv;
#endif
unsigned tls_pending, dtls_pending = 0, i; unsigned tls_pending, dtls_pending = 0, i;
time_t udp_recv_time = 0, now; time_t udp_recv_time = 0, now;
struct timespec tnow; struct timespec tnow;
@@ -988,6 +992,11 @@ static int connect_handler(worker_st * ws)
socklen_t sl; socklen_t sl;
bandwidth_st b_tx; bandwidth_st b_tx;
bandwidth_st b_rx; bandwidth_st b_rx;
sigset_t emptyset, blockset;
sigemptyset(&blockset);
sigemptyset(&emptyset);
sigaddset(&blockset, SIGTERM);
ws->buffer_size = 16 * 1024; ws->buffer_size = 16 * 1024;
ws->buffer = malloc(ws->buffer_size); ws->buffer = malloc(ws->buffer_size);
@@ -1389,9 +1398,17 @@ static int connect_handler(worker_st * ws)
dtls_pending = dtls_pending =
gnutls_record_check_pending(ws->dtls_session); gnutls_record_check_pending(ws->dtls_session);
if (tls_pending == 0 && dtls_pending == 0) { if (tls_pending == 0 && dtls_pending == 0) {
#ifdef HAVE_PSELECT
tv.tv_nsec = 0;
tv.tv_sec = 10;
ret = pselect(max + 1, &rfds, NULL, NULL, &tv, &emptyset);
#else
tv.tv_usec = 0; tv.tv_usec = 0;
tv.tv_sec = 10; tv.tv_sec = 10;
sigprocmask(SIG_UNBLOCK, &blockset, NULL);
ret = select(max + 1, &rfds, NULL, NULL, &tv); ret = select(max + 1, &rfds, NULL, NULL, &tv);
sigprocmask(SIG_BLOCK, &blockset, NULL);
#endif
if (ret == -1) { if (ret == -1) {
if (errno == EINTR) if (errno == EINTR)
continue; continue;