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

GUAC-911: Log FreeRDP plugin load failures to warning level.

Browse Source
This commit is contained in:
Michael Jumper 2014-11-12 12:02:38 -08:00
parent 374a43b27a
commit c0eb7df97a
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/protocols/rdp/client.c
View File

@ -162,7 +162,8 @@ BOOL rdp_freerdp_pre_connect(freerdp* instance) {
/* Load clipboard plugin */ /* Load clipboard plugin */
if (freerdp_channels_load_plugin(channels, instance->settings, if (freerdp_channels_load_plugin(channels, instance->settings,
"cliprdr", NULL)) "cliprdr", NULL))
guac_client_log(client, GUAC_LOG_ERROR, "Failed to load cliprdr plugin."); guac_client_log(client, GUAC_LOG_WARNING,
"Failed to load cliprdr plugin. Clipboard will not work.");
/* If audio enabled, choose an encoder */ /* If audio enabled, choose an encoder */
if (guac_client_data->settings.audio_enabled) { if (guac_client_data->settings.audio_enabled) {
@ -175,8 +176,8 @@ BOOL rdp_freerdp_pre_connect(freerdp* instance) {
/* Load sound plugin */ /* Load sound plugin */
if (freerdp_channels_load_plugin(channels, instance->settings, if (freerdp_channels_load_plugin(channels, instance->settings,
"guacsnd", guac_client_data->audio)) "guacsnd", guac_client_data->audio))
guac_client_log(client, GUAC_LOG_ERROR, guac_client_log(client, GUAC_LOG_WARNING,
"Failed to load guacsnd plugin."); "Failed to load guacsnd plugin. Audio will not work.");
} }
else else
@ -199,8 +200,8 @@ BOOL rdp_freerdp_pre_connect(freerdp* instance) {
/* Load RDPDR plugin */ /* Load RDPDR plugin */
if (freerdp_channels_load_plugin(channels, instance->settings, if (freerdp_channels_load_plugin(channels, instance->settings,
"guacdr", client)) "guacdr", client))
guac_client_log(client, GUAC_LOG_ERROR, guac_client_log(client, GUAC_LOG_WARNING,
"Failed to load guacdr plugin."); "Failed to load guacdr plugin. Drive redirection and printing will not work.");
} }
@ -221,12 +222,14 @@ BOOL rdp_freerdp_pre_connect(freerdp* instance) {
/* Attempt to load rail */ /* Attempt to load rail */
if (freerdp_channels_load_plugin(channels, instance->settings, if (freerdp_channels_load_plugin(channels, instance->settings,
"rail", plugin_data)) "rail", plugin_data))
guac_client_log(client, GUAC_LOG_ERROR, "Failed to load rail plugin."); guac_client_log(client, GUAC_LOG_WARNING,
"Failed to load rail plugin. RemoteApp will not work.");
#else #else
/* Attempt to load rail */ /* Attempt to load rail */
if (freerdp_channels_load_plugin(channels, instance->settings, if (freerdp_channels_load_plugin(channels, instance->settings,
"rail", instance->settings)) "rail", instance->settings))
guac_client_log(client, GUAC_LOG_ERROR, "Failed to load rail plugin."); guac_client_log(client, GUAC_LOG_WARNING,
"Failed to load rail plugin. RemoteApp will not work.");
#endif #endif
} }
@ -242,8 +245,8 @@ BOOL rdp_freerdp_pre_connect(freerdp* instance) {
/* Attempt to load guacsvc plugin for new static channel */ /* Attempt to load guacsvc plugin for new static channel */
if (freerdp_channels_load_plugin(channels, instance->settings, if (freerdp_channels_load_plugin(channels, instance->settings,
"guacsvc", svc)) { "guacsvc", svc)) {
guac_client_log(client, GUAC_LOG_ERROR, guac_client_log(client, GUAC_LOG_WARNING,
"Failed to load guacsvc plugin for channel \"%s\".", "Cannot create static channel \"%s\": failed to load guacsvc plugin.",
svc->name); svc->name);
guac_rdp_free_svc(svc); guac_rdp_free_svc(svc);
} }