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

Finish dynamic device implementation.

Browse Source
This commit is contained in:
Michael Jumper 2013-07-24 22:20:29 -07:00
parent d65a23349d
commit 6b4deb703a
4 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/protocols/rdp/guac_rdpdr/rdpdr_messages.c
View File

@ -151,7 +151,8 @@ static void guac_rdpdr_send_client_device_list_announce_request(guac_rdpdrPlugin
for (i=0; i<rdpdr->devices_registered; i++) { for (i=0; i<rdpdr->devices_registered; i++) {
guac_rdpdr_device* device = &(rdpdr->devices[i]); guac_rdpdr_device* device = &(rdpdr->devices[i]);
device->announce_handler(device, output_stream, i); device->announce_handler(device, output_stream, i);
guac_client_log_info(rdpdr->client, "Registered device %i", i); guac_client_log_info(rdpdr->client, "Registered device %i (%s)",
device->device_id, device->device_name);
} }
svc_plugin_send((rdpSvcPlugin*) rdpdr, output_stream); svc_plugin_send((rdpSvcPlugin*) rdpdr, output_stream);
@ -205,11 +206,13 @@ void guac_rdpdr_process_device_reply(guac_rdpdrPlugin* rdpdr, wStream* input_str
if (device_id >= 0 && device_id < rdpdr->devices_registered) { if (device_id >= 0 && device_id < rdpdr->devices_registered) {
if (severity == 0x0) if (severity == 0x0)
guac_client_log_info(rdpdr->client, "Device %i connected successfully"); guac_client_log_info(rdpdr->client, "Device %i (%s) connected successfully",
device_id, rdpdr->devices[device_id].device_name);
else else
guac_client_log_error(rdpdr->client, "Problem connecting device %i: " guac_client_log_error(rdpdr->client, "Problem connecting device %i (%s): "
"severity=0x%x, c=0x%x, n=0x%x, facility=0x%x, code=0x%x", "severity=0x%x, c=0x%x, n=0x%x, facility=0x%x, code=0x%x",
device_id, rdpdr->devices[device_id].device_name,
severity, c, n, facility, code); severity, c, n, facility, code);
} }

14
src/protocols/rdp/guac_rdpdr/rdpdr_printer.c
View File

@ -153,7 +153,7 @@ void guac_rdpdr_process_print_job_create(guac_rdpdr_device* device,
Stream_Write_UINT16(output_stream, PAKID_CORE_DEVICE_IOCOMPLETION); Stream_Write_UINT16(output_stream, PAKID_CORE_DEVICE_IOCOMPLETION);
/* Write content */ /* Write content */
Stream_Write_UINT32(output_stream, GUAC_PRINTER_DEVICE_ID); Stream_Write_UINT32(output_stream, device->device_id);
Stream_Write_UINT32(output_stream, completion_id); Stream_Write_UINT32(output_stream, completion_id);
Stream_Write_UINT32(output_stream, 0); /* Success */ Stream_Write_UINT32(output_stream, 0); /* Success */
Stream_Write_UINT32(output_stream, 0); /* fileId */ Stream_Write_UINT32(output_stream, 0); /* fileId */
@ -249,7 +249,7 @@ void guac_rdpdr_process_print_job_write(guac_rdpdr_device* device,
Stream_Write_UINT16(output_stream, PAKID_CORE_DEVICE_IOCOMPLETION); Stream_Write_UINT16(output_stream, PAKID_CORE_DEVICE_IOCOMPLETION);
/* Write content */ /* Write content */
Stream_Write_UINT32(output_stream, GUAC_PRINTER_DEVICE_ID); Stream_Write_UINT32(output_stream, device->device_id);
Stream_Write_UINT32(output_stream, completion_id); Stream_Write_UINT32(output_stream, completion_id);
Stream_Write_UINT32(output_stream, status); Stream_Write_UINT32(output_stream, status);
Stream_Write_UINT32(output_stream, length); Stream_Write_UINT32(output_stream, length);
@ -281,7 +281,7 @@ void guac_rdpdr_process_print_job_close(guac_rdpdr_device* device,
Stream_Write_UINT16(output_stream, PAKID_CORE_DEVICE_IOCOMPLETION); Stream_Write_UINT16(output_stream, PAKID_CORE_DEVICE_IOCOMPLETION);
/* Write content */ /* Write content */
Stream_Write_UINT32(output_stream, GUAC_PRINTER_DEVICE_ID); Stream_Write_UINT32(output_stream, device->device_id);
Stream_Write_UINT32(output_stream, completion_id); Stream_Write_UINT32(output_stream, completion_id);
Stream_Write_UINT32(output_stream, 0); /* NTSTATUS - success */ Stream_Write_UINT32(output_stream, 0); /* NTSTATUS - success */
Stream_Write_UINT32(output_stream, 0); /* padding*/ Stream_Write_UINT32(output_stream, 0); /* padding*/
@ -351,11 +351,17 @@ static void guac_rdpdr_device_printer_free_handler(guac_rdpdr_device* device) {
void guac_rdpdr_register_printer(guac_rdpdrPlugin* rdpdr) { void guac_rdpdr_register_printer(guac_rdpdrPlugin* rdpdr) {
int id = rdpdr->devices_registered++;
/* Get new device */ /* Get new device */
guac_rdpdr_device* device = &(rdpdr->devices[rdpdr->devices_registered++]); guac_rdpdr_device* device = &(rdpdr->devices[id]);
/* Init device */ /* Init device */
device->rdpdr = rdpdr; device->rdpdr = rdpdr;
device->device_id = id;
device->device_name = "Guacamole Printer";
/* Set handlers */
device->announce_handler = guac_rdpdr_device_printer_announce_handler; device->announce_handler = guac_rdpdr_device_printer_announce_handler;
device->iorequest_handler = guac_rdpdr_device_printer_iorequest_handler; device->iorequest_handler = guac_rdpdr_device_printer_iorequest_handler;
device->free_handler = guac_rdpdr_device_printer_free_handler; device->free_handler = guac_rdpdr_device_printer_free_handler;

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

@ -53,6 +53,7 @@
#include "rdpdr_service.h" #include "rdpdr_service.h"
#include "rdpdr_messages.h" #include "rdpdr_messages.h"
#include "rdpdr_printer.h"
/** /**

5
src/protocols/rdp/guac_rdpdr/rdpdr_service.h
View File

@ -79,6 +79,11 @@ struct guac_rdpdr_device {
*/ */
guac_rdpdrPlugin* rdpdr; guac_rdpdrPlugin* rdpdr;
/**
* The ID assigned to this device by the RDPDR plugin.
*/
int device_id;
/** /**
* An arbitrary device name, used for logging purposes only. * An arbitrary device name, used for logging purposes only.
*/ */