Rename SendChannelData and add ReceiveChannelData callbacks.

This commit is contained in:
Vic Lee 2011-08-03 02:12:08 +08:00
parent 621c349df4
commit a7fe9c9795
5 changed files with 8 additions and 6 deletions

View File

@ -62,7 +62,7 @@ void test_chanman(void)
settings.hostname = "testhost";
instance.settings = &settings;
instance.ChannelDataInput = test_rdp_channel_data;
instance.SendChannelData = test_rdp_channel_data;
chan_man = freerdp_chanman_new();

View File

@ -113,7 +113,7 @@ void test_cliprdr(void)
settings.hostname = "testhost";
instance.settings = &settings;
instance.ChannelDataInput = test_rdp_channel_data;
instance.SendChannelData = test_rdp_channel_data;
chan_man = freerdp_chanman_new();

View File

@ -72,7 +72,7 @@ void test_drdynvc(void)
settings.hostname = "testhost";
instance.settings = &settings;
instance.ChannelDataInput = test_rdp_channel_data;
instance.SendChannelData = test_rdp_channel_data;
chan_man = freerdp_chanman_new();

View File

@ -42,7 +42,8 @@ typedef boolean (*pcPreConnect)(freerdp* freerdp);
typedef boolean (*pcPostConnect)(freerdp* freerdp);
typedef boolean (*pcGetFileDescriptor)(freerdp* freerdp, void** rfds, int* rcount, void** wfds, int* wcount);
typedef boolean (*pcCheckFileDescriptor)(freerdp* freerdp);
typedef int (*pcChannelDataInput)(freerdp* freerdp, int channelId, uint8* data, int size);
typedef int (*pcSendChannelData)(freerdp* freerdp, int channelId, uint8* data, int size);
typedef int (*pcReceiveChannelData)(freerdp* freerdp, int channelId, uint8* data, int size, int flags, int total_size);
struct rdp_freerdp
{
@ -61,7 +62,8 @@ struct rdp_freerdp
pcPostConnect PostConnect;
pcGetFileDescriptor GetFileDescriptor;
pcCheckFileDescriptor CheckFileDescriptor;
pcChannelDataInput ChannelDataInput;
pcSendChannelData SendChannelData;
pcReceiveChannelData ReceiveChannelData;
};
FREERDP_API freerdp* freerdp_new();

View File

@ -820,7 +820,7 @@ static void freerdp_chanman_process_sync(rdpChanMan* chan_man, freerdp* instance
lchan_data->name, &lindex);
if (lrdp_chan != 0)
{
instance->ChannelDataInput(instance, lrdp_chan->chan_id, ldata, ldata_len);
IFCALL(instance->SendChannelData, instance, lrdp_chan->chan_id, ldata, ldata_len);
}
if (lchan_data->open_event_proc != 0)
{