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

GUACAMOLE-221: Merge ensure guacd always enables broadcast socket keep-alive.

Browse Source
This commit is contained in:
Virtually Nick 2020-11-02 16:00:59 -05:00 committed by GitHub
commit c48feb30f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/guacd/proc.c
View File

@ -330,6 +330,9 @@ static void guacd_exec_proc(guacd_proc* proc, const char* protocol) {
/* The first file descriptor is the owner */ /* The first file descriptor is the owner */
int owner = 1; int owner = 1;
/* Enable keep alive on the broadcast socket */
guac_socket_require_keep_alive(client->socket);
/* Add each received file descriptor as a new user */ /* Add each received file descriptor as a new user */
int received_fd; int received_fd;
while ((received_fd = guacd_recv_fd(proc->fd_socket)) != -1) { while ((received_fd = guacd_recv_fd(proc->fd_socket)) != -1) {
@ -341,9 +344,6 @@ static void guacd_exec_proc(guacd_proc* proc, const char* protocol) {
} }
/* Enable keep alive on the broadcast socket */
guac_socket_require_keep_alive(client->socket);
cleanup_client: cleanup_client:
/* Request client to stop/disconnect */ /* Request client to stop/disconnect */