|
|
@ -46,7 +46,6 @@ static int g_rdpsnd_index = -1;
|
|
|
|
static int g_rdpdr_index = -1;
|
|
|
|
static int g_rdpdr_index = -1;
|
|
|
|
static int g_rail_index = -1;
|
|
|
|
static int g_rail_index = -1;
|
|
|
|
static int g_drdynvc_index = -1;
|
|
|
|
static int g_drdynvc_index = -1;
|
|
|
|
static int g_sent = 0; /* if sent data to xrdp, waiting response */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* state info for dynamic virtual channels */
|
|
|
|
/* state info for dynamic virtual channels */
|
|
|
|
static struct xrdp_api_data *g_dvc_channels[MAX_DVC_CHANNELS];
|
|
|
|
static struct xrdp_api_data *g_dvc_channels[MAX_DVC_CHANNELS];
|
|
|
@ -297,7 +296,6 @@ send_data_from_chan_item(struct chan_item *chan_item)
|
|
|
|
s_mark_end(s);
|
|
|
|
s_mark_end(s);
|
|
|
|
LOGM((LOG_LEVEL_DEBUG, "chansrv::send_data_from_chan_item: -- "
|
|
|
|
LOGM((LOG_LEVEL_DEBUG, "chansrv::send_data_from_chan_item: -- "
|
|
|
|
"size %d chan_flags 0x%8.8x", size, chan_flags));
|
|
|
|
"size %d chan_flags 0x%8.8x", size, chan_flags));
|
|
|
|
g_sent = 1;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
error = trans_write_copy(g_con_trans);
|
|
|
|
error = trans_write_copy(g_con_trans);
|
|
|
|
if (error != 0)
|
|
|
|
if (error != 0)
|
|
|
@ -363,10 +361,7 @@ send_channel_data(int chan_id, char *data, int size)
|
|
|
|
if (g_chan_items[index].id == chan_id)
|
|
|
|
if (g_chan_items[index].id == chan_id)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
add_data_to_chan_item(g_chan_items + index, data, size);
|
|
|
|
add_data_to_chan_item(g_chan_items + index, data, size);
|
|
|
|
if (g_sent == 0)
|
|
|
|
check_chan_items();
|
|
|
|
{
|
|
|
|
|
|
|
|
check_chan_items();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -579,8 +574,6 @@ process_message_channel_setup(struct stream *s)
|
|
|
|
|
|
|
|
|
|
|
|
if (g_rdpsnd_index >= 0)
|
|
|
|
if (g_rdpsnd_index >= 0)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
/* gets reset to 1 by next send_data_from_chan_item */
|
|
|
|
|
|
|
|
g_sent = 0; /* wait for response! */
|
|
|
|
|
|
|
|
sound_init();
|
|
|
|
sound_init();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -679,7 +672,6 @@ static int APP_CC
|
|
|
|
process_message_channel_data_response(struct stream *s)
|
|
|
|
process_message_channel_data_response(struct stream *s)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
LOG(10, ("process_message_channel_data_response:"));
|
|
|
|
LOG(10, ("process_message_channel_data_response:"));
|
|
|
|
g_sent = 0;
|
|
|
|
|
|
|
|
check_chan_items();
|
|
|
|
check_chan_items();
|
|
|
|
return 0;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|