pxcloud/guacamole-server
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GUACAMOLE-1846: Merge correction ensuring join_pending_handler is only invoked when necessary.

Browse Source
This commit is contained in:
Mike Jumper 2023-09-12 17:15:55 -07:00 committed by GitHub
commit 2dbd1f758c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/libguac/client.c
View File

@ -185,24 +185,22 @@ static void guac_client_promote_pending_users(union sigval data) {
/* Acquire the lock for reading and modifying the list of pending users */
guac_rwlock_acquire_write_lock(&(client->__pending_users_lock));
/* Skip user promotion entirely if there's no pending users */
if (client->__pending_users == NULL)
goto promotion_complete;
/* Run the pending join handler, if one is defined */
if (client->join_pending_handler) {
/* If an error occurs in the pending handler */
if(client->join_pending_handler(client)) {
guac_rwlock_release_lock(&(client->__pending_users_lock));
/* Mark the handler as not running */
pthread_mutex_lock(&(client->__pending_users_timer_mutex));
client->__pending_users_timer_state = GUAC_CLIENT_PENDING_TIMER_REGISTERED;
pthread_mutex_unlock(&(client->__pending_users_timer_mutex));
/* Log a warning and abort the promotion of the pending users */
guac_client_log(client, GUAC_LOG_WARNING,
"join_pending_handler did not successfully complete;"
" any pending users have not been promoted.\n");
return;
goto promotion_complete;
}
}
@ -239,6 +237,8 @@ static void guac_client_promote_pending_users(union sigval data) {
guac_rwlock_release_lock(&(client->__users_lock));
promotion_complete:
/* Release the lock (this is done AFTER updating the connected user list
* to ensure that all users are always on exactly one of these lists) */
guac_rwlock_release_lock(&(client->__pending_users_lock));