Handle pipe receive, write to SVC.

This commit is contained in:
Michael Jumper 2014-03-02 12:38:28 -08:00
parent ed367824a6
commit 86d2266580
4 changed files with 39 additions and 5 deletions

View File

@ -643,11 +643,8 @@ int rdp_guac_client_blob_handler(guac_client* client, guac_stream* stream,
} /* end if upload stream */ } /* end if upload stream */
/* Handle received SVC data */ /* Handle received SVC data */
else if (rdp_stream->type == GUAC_RDP_INBOUND_SVC_STREAM) { else if (rdp_stream->type == GUAC_RDP_INBOUND_SVC_STREAM)
guac_client_log_info(client, guac_rdp_svc_write(rdp_stream->svc, data, length);
"STUB: Received %i bytes on pipe for channel \"%s\".",
length, rdp_stream->svc->name);
}
guac_protocol_send_ack(client->socket, stream, "OK (DATA RECEIVED)", guac_protocol_send_ack(client->socket, stream, "OK (DATA RECEIVED)",
GUAC_PROTOCOL_STATUS_SUCCESS); GUAC_PROTOCOL_STATUS_SUCCESS);

View File

@ -74,6 +74,9 @@ int VirtualChannelEntry(PCHANNEL_ENTRY_POINTS pEntryPoints) {
svc_plugin->plugin.event_callback = guac_svc_process_event; svc_plugin->plugin.event_callback = guac_svc_process_event;
svc_plugin->plugin.terminate_callback = guac_svc_process_terminate; svc_plugin->plugin.terminate_callback = guac_svc_process_terminate;
/* Store plugin reference in SVC */
svc->plugin = (rdpSvcPlugin*) svc_plugin;
/* Finish init */ /* Finish init */
svc_plugin_init((rdpSvcPlugin*) svc_plugin, pEntryPoints); svc_plugin_init((rdpSvcPlugin*) svc_plugin, pEntryPoints);
return 1; return 1;

View File

@ -26,6 +26,7 @@
#include "rdp_svc.h" #include "rdp_svc.h"
#include <freerdp/freerdp.h> #include <freerdp/freerdp.h>
#include <freerdp/utils/svc_plugin.h>
#include <guacamole/client.h> #include <guacamole/client.h>
#ifdef ENABLE_WINPR #ifdef ENABLE_WINPR
@ -41,6 +42,7 @@ guac_rdp_svc* guac_rdp_alloc_svc(guac_client* client, char* name) {
/* Init SVC */ /* Init SVC */
svc->client = client; svc->client = client;
svc->name = strdup(name); svc->name = strdup(name);
svc->plugin = NULL;
svc->input_pipe = NULL; svc->input_pipe = NULL;
svc->output_pipe = NULL; svc->output_pipe = NULL;
@ -119,3 +121,24 @@ guac_rdp_svc* guac_rdp_remove_svc(guac_client* client, const char* name) {
} }
void guac_rdp_svc_write(guac_rdp_svc* svc, void* data, int length) {
wStream* output_stream;
/* Do not write of plugin not associated */
if (svc->plugin == NULL) {
guac_client_log_error(svc->client,
"Channel \"%s\" output dropped.",
svc->name);
return;
}
/* Build packet */
output_stream = Stream_New(NULL, length);
Stream_Write(output_stream, data, length);
/* Send packet */
svc_plugin_send(svc->plugin, output_stream);
}

View File

@ -26,6 +26,7 @@
#include "config.h" #include "config.h"
#include <freerdp/freerdp.h> #include <freerdp/freerdp.h>
#include <freerdp/utils/svc_plugin.h>
#include <guacamole/client.h> #include <guacamole/client.h>
#ifdef ENABLE_WINPR #ifdef ENABLE_WINPR
@ -45,6 +46,11 @@ typedef struct guac_rdp_svc {
*/ */
guac_client* client; guac_client* client;
/**
* Reference to associated SVC plugin.
*/
rdpSvcPlugin* plugin;
/** /**
* The name of the RDP channel in use, and the name to use for each pipe. * The name of the RDP channel in use, and the name to use for each pipe.
*/ */
@ -89,5 +95,10 @@ guac_rdp_svc* guac_rdp_get_svc(guac_client* client, const char* name);
*/ */
guac_rdp_svc* guac_rdp_remove_svc(guac_client* client, const char* name); guac_rdp_svc* guac_rdp_remove_svc(guac_client* client, const char* name);
/**
* Write the given blob of data to the virtual channel.
*/
void guac_rdp_svc_write(guac_rdp_svc* svc, void* data, int length);
#endif #endif