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

Remove old use of blob. Use new file semantics.

Browse Source
This commit is contained in:
Michael Jumper 2013-09-24 12:58:58 -07:00
parent e1798ee3db
commit daa10be990
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,7 +44,7 @@ static void* guac_rdpdr_print_filter_output_thread(void* data) {
/* Write all output as blobs */ /* Write all output as blobs */
while ((length = read(printer_data->printer_output, buffer, sizeof(buffer))) > 0) while ((length = read(printer_data->printer_output, buffer, sizeof(buffer))) > 0)
guac_protocol_send_blob(device->rdpdr->client->socket, guac_protocol_send_blob(device->rdpdr->client->socket,
GUAC_RDPDR_PRINTER_BLOB, buffer, length); printer_data->stream, buffer, length);
/* Log any error */ /* Log any error */
if (length < 0) if (length < 0)
@ -219,7 +219,7 @@ void guac_rdpdr_process_print_job_write(guac_rdpdr_device* device,
/* Begin file */ /* Begin file */
guac_client_log_info(device->rdpdr->client, "Print job created"); guac_client_log_info(device->rdpdr->client, "Print job created");
guac_protocol_send_file(device->rdpdr->client->socket, guac_protocol_send_file(device->rdpdr->client->socket,
GUAC_RDPDR_PRINTER_BLOB, "application/pdf", filename); printer_data->stream, "application/pdf", filename);
/* Start print process */ /* Start print process */
if (guac_rdpdr_create_print_process(device) != 0) { if (guac_rdpdr_create_print_process(device) != 0) {
@ -274,7 +274,7 @@ void guac_rdpdr_process_print_job_close(guac_rdpdr_device* device,
/* Close file */ /* Close file */
guac_client_log_info(device->rdpdr->client, "Print job closed"); guac_client_log_info(device->rdpdr->client, "Print job closed");
guac_protocol_send_end(device->rdpdr->client->socket, GUAC_RDPDR_PRINTER_BLOB); guac_protocol_send_end(device->rdpdr->client->socket, printer_data->stream);
/* Write header */ /* Write header */
Stream_Write_UINT16(output_stream, RDPDR_CTYP_CORE); Stream_Write_UINT16(output_stream, RDPDR_CTYP_CORE);
@ -346,6 +346,8 @@ static void guac_rdpdr_device_printer_iorequest_handler(guac_rdpdr_device* devic
} }
static void guac_rdpdr_device_printer_free_handler(guac_rdpdr_device* device) { static void guac_rdpdr_device_printer_free_handler(guac_rdpdr_device* device) {
guac_rdpdr_printer_data* printer_data = (guac_rdpdr_printer_data*) device->data;
guac_client_free_stream(device->rdpdr->client, printer_data->stream);
free(device->data); free(device->data);
} }
@ -355,6 +357,7 @@ void guac_rdpdr_register_printer(guac_rdpdrPlugin* rdpdr) {
/* Get new device */ /* Get new device */
guac_rdpdr_device* device = &(rdpdr->devices[id]); guac_rdpdr_device* device = &(rdpdr->devices[id]);
guac_rdpdr_printer_data* printer_data;
/* Init device */ /* Init device */
device->rdpdr = rdpdr; device->rdpdr = rdpdr;
@ -367,7 +370,9 @@ void guac_rdpdr_register_printer(guac_rdpdrPlugin* rdpdr) {
device->free_handler = guac_rdpdr_device_printer_free_handler; device->free_handler = guac_rdpdr_device_printer_free_handler;
/* Init data */ /* Init data */
device->data = malloc(sizeof(guac_rdpdr_printer_data)); printer_data = malloc(sizeof(guac_rdpdr_printer_data));
printer_data->stream = guac_client_alloc_stream(rdpdr->client);
device->data = printer_data;
} }

10
src/protocols/rdp/guac_rdpdr/rdpdr_printer.h
View File

@ -46,16 +46,16 @@
#include <freerdp/utils/svc_plugin.h> #include <freerdp/utils/svc_plugin.h>
/**
* The index of the blob to use when sending printed files.
*/
#define GUAC_RDPDR_PRINTER_BLOB 0
/** /**
* Data specific to an instance of the printer device. * Data specific to an instance of the printer device.
*/ */
typedef struct guac_rdpdr_printer_data { typedef struct guac_rdpdr_printer_data {
/**
* Stream for receiving printed files.
*/
guac_stream* stream;
/** /**
* File descriptor that should be written to when sending documents to the * File descriptor that should be written to when sending documents to the
* printer. * printer.