From 944f4ac8a93a2223f111dc3f6a42d29f81d727c3 Mon Sep 17 00:00:00 2001 From: Vic Lee Date: Sun, 10 Jul 2011 17:28:24 +0800 Subject: [PATCH] libfreerdp-utils/svc_plugin: use STREAM for sending. --- include/freerdp/utils/svc_plugin.h | 2 +- libfreerdp-utils/svc_plugin.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/freerdp/utils/svc_plugin.h b/include/freerdp/utils/svc_plugin.h index 149e2091f..48cbdf61e 100644 --- a/include/freerdp/utils/svc_plugin.h +++ b/include/freerdp/utils/svc_plugin.h @@ -41,6 +41,6 @@ struct rdp_svc_plugin }; void svc_plugin_init(rdpSvcPlugin* plugin); -int svc_plugin_send(rdpSvcPlugin* plugin, uint8* data, int size); +int svc_plugin_send(rdpSvcPlugin* plugin, STREAM* data_out); #endif /* __SVC_PLUGIN_UTILS_H */ diff --git a/libfreerdp-utils/svc_plugin.c b/libfreerdp-utils/svc_plugin.c index b030a4e87..809bd906c 100644 --- a/libfreerdp-utils/svc_plugin.c +++ b/libfreerdp-utils/svc_plugin.c @@ -165,7 +165,7 @@ static void svc_plugin_open_event(uint32 openHandle, uint32 event, void* pData, svc_plugin_process_received(plugin, pData, dataLength, totalLength, dataFlags); break; case CHANNEL_EVENT_WRITE_COMPLETE: - xfree(pData); + stream_free((STREAM*)pData); break; } } @@ -253,14 +253,14 @@ void svc_plugin_init(rdpSvcPlugin* plugin) &plugin->channel_def, 1, VIRTUAL_CHANNEL_VERSION_WIN2000, svc_plugin_init_event); } -int svc_plugin_send(rdpSvcPlugin* plugin, uint8* data, int size) +int svc_plugin_send(rdpSvcPlugin* plugin, STREAM* data_out) { uint32 error = 0; - DEBUG_SVC("size %d", size); + DEBUG_SVC("length %d", stream_get_length(data_out)); error = plugin->channel_entry_points.pVirtualChannelWrite(plugin->priv->open_handle, - data, size, data); + stream_get_data(data_out), stream_get_length(data_out), data_out); if (error != CHANNEL_RC_OK) printf("svc_plugin_send: VirtualChannelWrite failed %d", error);