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

Call free handler on devices. Only add printer if enabled.

Browse Source
This commit is contained in:
Michael Jumper 2013-07-24 22:49:24 -07:00
parent 6b4deb703a
commit 1e521a1696
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/protocols/rdp/guac_rdpdr/rdpdr_service.c
View File

@ -55,6 +55,8 @@
#include "rdpdr_messages.h" #include "rdpdr_messages.h"
#include "rdpdr_printer.h" #include "rdpdr_printer.h"
#include "client.h"
/** /**
* Entry point for RDPDR virtual channel. * Entry point for RDPDR virtual channel.
@ -95,11 +97,15 @@ void guac_rdpdr_process_connect(rdpSvcPlugin* plugin) {
guac_client* client = (guac_client*) guac_client* client = (guac_client*)
plugin->channel_entry_points.pExtendedData; plugin->channel_entry_points.pExtendedData;
/* Get data from client */
rdp_guac_client_data* client_data = (rdp_guac_client_data*) client->data;
/* Init plugin */ /* Init plugin */
rdpdr->client = client; rdpdr->client = client;
/* For now, always register the printer */ /* Register printer if enabled */
guac_rdpdr_register_printer(rdpdr); if (client_data->settings.printing_enabled)
guac_rdpdr_register_printer(rdpdr);
/* Log that printing, etc. has been loaded */ /* Log that printing, etc. has been loaded */
guac_client_log_info(client, "guacdr connected."); guac_client_log_info(client, "guacdr connected.");
@ -107,6 +113,17 @@ void guac_rdpdr_process_connect(rdpSvcPlugin* plugin) {
} }
void guac_rdpdr_process_terminate(rdpSvcPlugin* plugin) { void guac_rdpdr_process_terminate(rdpSvcPlugin* plugin) {
guac_rdpdrPlugin* rdpdr = (guac_rdpdrPlugin*) plugin;
int i;
for (i=0; i<rdpdr->devices_registered; i++) {
guac_rdpdr_device* device = &(rdpdr->devices[i]);
guac_client_log_info(rdpdr->client, "Unloading device %i (%s)",
device->device_id, device->device_name);
device->free_handler(device);
}
free(plugin); free(plugin);
} }