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

GUACAMOLE-1293: Fix copy-pasta and style issues; add user ID to information passed to client.

Browse Source
This commit is contained in:
Virtually Nick 2022-11-24 18:12:49 -05:00
parent 623c398005
commit 5b1677f21a
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/libguac/client.c
View File

@ -764,18 +764,22 @@ static void* guac_client_owner_notify_join_callback(guac_user* user, void* data)
if (user == NULL) if (user == NULL)
return (void*) ((intptr_t) -1); return (void*) ((intptr_t) -1);
char* owner = "owner"; char* log_owner = "owner";
if (user->info.name != NULL) if (user->info.name != NULL)
owner = (char *) user->info.name; log_owner = (char *) user->info.name;
char* joinName = "anonymous"; char* log_joiner = "anonymous";
if (joiner->info.name != NULL) char* send_joiner = "";
joinName = (char *) joiner->info.name; if (joiner->info.name != NULL) {
log_joiner = (char *) joiner->info.name;
send_joiner = (char *) joiner->info.name;
}
guac_user_log(user, GUAC_LOG_DEBUG, "Notifying owner \"%s\" of \"%s\" joining.", owner, joinName); guac_user_log(user, GUAC_LOG_DEBUG, "Notifying owner \"%s\" of \"%s\" joining.",
log_owner, log_joiner);
/* Send required parameters to owner. */ /* Send user joined notification to owner. */
const char* args[] = { (const char*)joinName, NULL }; const char* args[] = { (const char*)joiner->user_id, (const char*)send_joiner, NULL };
return (void*) ((intptr_t) guac_protocol_send_msg(user->socket, GUAC_MESSAGE_USER_JOINED, args)); return (void*) ((intptr_t) guac_protocol_send_msg(user->socket, GUAC_MESSAGE_USER_JOINED, args));
} }
@ -819,18 +823,22 @@ static void* guac_client_owner_notify_leave_callback(guac_user* user, void* data
if (user == NULL) if (user == NULL)
return (void*) ((intptr_t) -1); return (void*) ((intptr_t) -1);
char* ownerName = "owner"; char* log_owner = "owner";
if (user->info.name != NULL) if (user->info.name != NULL)
ownerName = (char *) user->info.name; log_owner = (char *) user->info.name;
char* quitterName = "anonymous"; char* log_quitter = "anonymous";
if (quitter->info.name != NULL) char* send_quitter = "";
quitterName = (char *) quitter->info.name; if (quitter->info.name != NULL) {
log_quitter = (char *) quitter->info.name;
send_quitter = (char *) quitter->info.name;
}
guac_user_log(user, GUAC_LOG_DEBUG, "Notifying owner \"%s\" of \"%s\" leaving.", ownerName, quitterName); guac_user_log(user, GUAC_LOG_DEBUG, "Notifying owner \"%s\" of \"%s\" leaving.",
log_owner, log_quitter);
/* Send required parameters to owner. */ /* Send user left notification to owner. */
const char* args[] = { (const char*)quitterName, NULL }; const char* args[] = { (const char*)quitter->user_id, (const char*)send_quitter, NULL };
return (void*) ((intptr_t) guac_protocol_send_msg(user->socket, GUAC_MESSAGE_USER_LEFT, args)); return (void*) ((intptr_t) guac_protocol_send_msg(user->socket, GUAC_MESSAGE_USER_LEFT, args));
} }