mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libfreerdp-core: change channel_send argument in order to be shared with server code.

Browse Source
This commit is contained in:
Vic Lee 2011-12-10 15:51:42 +08:00
parent 08c1043753
commit 2ee03f035a
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libfreerdp-core/channel.c
View File

@ -28,7 +28,7 @@
#include "rdp.h" #include "rdp.h"
#include "channel.h" #include "channel.h"
boolean freerdp_channel_send(freerdp* instance, uint16 channel_id, uint8* data, int size) boolean freerdp_channel_send(rdpRdp* rdp, uint16 channel_id, uint8* data, int size)
{ {
STREAM* s; STREAM* s;
uint32 flags; uint32 flags;
@ -36,11 +36,11 @@ boolean freerdp_channel_send(freerdp* instance, uint16 channel_id, uint8* data,
int chunk_size; int chunk_size;
rdpChannel* channel = NULL; rdpChannel* channel = NULL;
for (i = 0; i < instance->settings->num_channels; i++) for (i = 0; i < rdp->settings->num_channels; i++)
{ {
if (instance->settings->channels[i].channel_id == channel_id) if (rdp->settings->channels[i].channel_id == channel_id)
{ {
channel = &instance->settings->channels[i]; channel = &rdp->settings->channels[i];
break; break;
} }
} }
@ -55,11 +55,11 @@ boolean freerdp_channel_send(freerdp* instance, uint16 channel_id, uint8* data,
left = size; left = size;
while (left > 0) while (left > 0)
{ {
s = rdp_send_stream_init(instance->context->rdp); s = rdp_send_stream_init(rdp);
if (left > (int) instance->settings->vc_chunk_size) if (left > (int) rdp->settings->vc_chunk_size)
{ {
chunk_size = instance->settings->vc_chunk_size; chunk_size = rdp->settings->vc_chunk_size;
} }
else else
{ {
@ -76,7 +76,7 @@ boolean freerdp_channel_send(freerdp* instance, uint16 channel_id, uint8* data,
stream_check_size(s, chunk_size); stream_check_size(s, chunk_size);
stream_write(s, data, chunk_size); stream_write(s, data, chunk_size);
rdp_send(instance->context->rdp, s, channel_id); rdp_send(rdp, s, channel_id);
data += chunk_size; data += chunk_size;
left -= chunk_size; left -= chunk_size;

2
libfreerdp-core/channel.h
View File

@ -20,7 +20,7 @@
#ifndef __CHANNEL_H #ifndef __CHANNEL_H
#define __CHANNEL_H #define __CHANNEL_H
boolean freerdp_channel_send(freerdp* instance, uint16 channel_id, uint8* data, int size); boolean freerdp_channel_send(rdpRdp* rdp, uint16 channel_id, uint8* data, int size);
void freerdp_channel_process(freerdp* instance, STREAM* s, uint16 channel_id); void freerdp_channel_process(freerdp* instance, STREAM* s, uint16 channel_id);
#endif /* __CHANNEL_H */ #endif /* __CHANNEL_H */

2
libfreerdp-core/rdp.c
View File

@ -775,7 +775,7 @@ static boolean rdp_recv_callback(rdpTransport* transport, STREAM* s, void* extra
int rdp_send_channel_data(rdpRdp* rdp, int channel_id, uint8* data, int size) int rdp_send_channel_data(rdpRdp* rdp, int channel_id, uint8* data, int size)
{ {
return freerdp_channel_send(rdp->instance, channel_id, data, size); return freerdp_channel_send(rdp, channel_id, data, size);
} }
/** /**