sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-11-13 00:00:38 -05:00
Code Issues Projects Releases Wiki Activity

libtls: Catch POLLHUP/NVAL in TLS socket splicing

Browse Source 
If one of the sockets gets disconnected, some systems return POLLHUP. Signal
the socket as ready to let the read/write call fail properly.
This commit is contained in:
Martin Willi 2014-11-28 15:50:58 +01:00
parent 015fb3134d
commit 4ef819a379
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libtls/tls_socket.c
View File

@ -308,7 +308,7 @@ METHOD(tls_socket_t, splice, bool,
DBG1(DBG_TLS, "TLS select error: %s", strerror(errno)); DBG1(DBG_TLS, "TLS select error: %s", strerror(errno));
return FALSE; return FALSE;
} }
while (!plain_eof && pfd[0].revents & POLLIN) while (!plain_eof && pfd[0].revents & (POLLIN | POLLHUP | POLLNVAL))
{ {
in = read_(this, buf, sizeof(buf), FALSE); in = read_(this, buf, sizeof(buf), FALSE);
switch (in) switch (in)
@ -341,7 +341,7 @@ METHOD(tls_socket_t, splice, bool,
} }
break; break;
} }
if (!crypto_eof && pfd[1].revents & POLLIN) if (!crypto_eof && pfd[1].revents & (POLLIN | POLLHUP | POLLNVAL))
{ {
in = read(rfd, buf, sizeof(buf)); in = read(rfd, buf, sizeof(buf));
switch (in) switch (in)