maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GUACAMOLE-118: Migrate to poll() instead of select() for guacd's SSL/TLS guac_socket implementation.

Browse Source
This commit is contained in:
Michael Jumper 2016-11-11 13:06:05 -08:00
parent 9d6d2aeba7
commit 12d575b8e6
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/guacd/socket-ssl.c
View File

@ -21,8 +21,8 @@
#include "socket-ssl.h" #include "socket-ssl.h"
#include <poll.h>
#include <stdlib.h> #include <stdlib.h>
#include <sys/select.h>
#include <guacamole/error.h> #include <guacamole/error.h>
#include <guacamole/socket.h> #include <guacamole/socket.h>
@ -70,24 +70,22 @@ static int __guac_socket_ssl_select_handler(guac_socket* socket, int usec_timeou
guac_socket_ssl_data* data = (guac_socket_ssl_data*) socket->data; guac_socket_ssl_data* data = (guac_socket_ssl_data*) socket->data;
fd_set fds;
struct timeval timeout;
int retval; int retval;
/* Initialize fd_set with single underlying file descriptor */ /* Initialize with single underlying file descriptor */
FD_ZERO(&fds); struct pollfd fds[1] = {{
FD_SET(data->fd, &fds); .fd = data->fd,
.events = POLLIN,
.revents = 0,
}};
/* No timeout if usec_timeout is negative */ /* No timeout if usec_timeout is negative */
if (usec_timeout < 0) if (usec_timeout < 0)
retval = select(data->fd + 1, &fds, NULL, NULL, NULL); retval = poll(fds, 1, -1);
/* Handle timeout if specified */ /* Handle timeout if specified, rounding up to poll()'s granularity */
else { else
timeout.tv_sec = usec_timeout/1000000; retval = poll(fds, 1, (usec_timeout + 999) / 1000);
timeout.tv_usec = usec_timeout%1000000;
retval = select(data->fd + 1, &fds, NULL, NULL, &timeout);
}
/* Properly set guac_error */ /* Properly set guac_error */
if (retval < 0) { if (retval < 0) {