Added client parameter.
This commit is contained in:
Michael Jumper
parent
45e083985e
commit
41b4a30042
@ -33,242 +33,10 @@
|
|||||||
|
|
||||||
#include "rdpsnd_main.h"
|
#include "rdpsnd_main.h"
|
||||||
|
|
||||||
void guac_rdpsnd_process_receive(rdpSvcPlugin* plugin,
|
/* SVC DEFINITION */
|
||||||
STREAM* data_in) {
|
|
||||||
|
|
||||||
guac_rdpsndPlugin* rdpsnd = (guac_rdpsndPlugin*) plugin;
|
DEFINE_SVC_PLUGIN(guac_rdpsnd, "rdpsnd",
|
||||||
|
CHANNEL_OPTION_INITIALIZED | CHANNEL_OPTION_ENCRYPT_RDP)
|
||||||
uint8 msgType;
|
|
||||||
uint16 BodySize;
|
|
||||||
|
|
||||||
if (rdpsnd->expectingWave) {
|
|
||||||
rdpsnd_process_message_wave(rdpsnd, data_in);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Read event */
|
|
||||||
stream_read_uint8(data_in, msgType); /* msgType */
|
|
||||||
stream_seek_uint8(data_in); /* bPad */
|
|
||||||
stream_read_uint16(data_in, BodySize);
|
|
||||||
|
|
||||||
switch (msgType) {
|
|
||||||
|
|
||||||
case SNDC_FORMATS:
|
|
||||||
guac_rdpsnd_process_message_formats(rdpsnd, data_in);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case SNDC_TRAINING:
|
|
||||||
guac_rdpsnd_process_message_training(rdpsnd, data_in);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case SNDC_WAVE:
|
|
||||||
guac_rdpsnd_process_message_wave_info(rdpsnd, data_in, BodySize);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case SNDC_CLOSE:
|
|
||||||
guac_rdpsnd_process_message_close(rdpsnd);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case SNDC_SETVOLUME:
|
|
||||||
guac_rdpsnd_process_message_setvolume(rdpsnd, data_in);
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
/*DEBUG_WARN("unknown msgType %d", msgType);*/
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* receives a list of server supported formats and returns a list
|
|
||||||
of client supported formats */
|
|
||||||
void guac_rdpsnd_process_message_formats(guac_rdpsndPlugin* rdpsnd, STREAM* data_in) {
|
|
||||||
|
|
||||||
rdpSvcPlugin* plugin = (rdpSvcPlugin*)rdpsnd;
|
|
||||||
|
|
||||||
/* Get client from plugin */
|
|
||||||
guac_client* client = (guac_client*)
|
|
||||||
plugin->channel_entry_points.pExtendedData;
|
|
||||||
|
|
||||||
uint16 wNumberOfFormats;
|
|
||||||
uint16 nFormat;
|
|
||||||
uint16 wVersion;
|
|
||||||
STREAM* data_out;
|
|
||||||
rdpsndFormat* out_formats;
|
|
||||||
uint16 n_out_formats;
|
|
||||||
rdpsndFormat* format;
|
|
||||||
uint8* format_mark;
|
|
||||||
uint8* data_mark;
|
|
||||||
int pos;
|
|
||||||
|
|
||||||
stream_seek_uint32(data_in); /* dwFlags */
|
|
||||||
stream_seek_uint32(data_in); /* dwVolume */
|
|
||||||
stream_seek_uint32(data_in); /* dwPitch */
|
|
||||||
stream_seek_uint16(data_in); /* wDGramPort */
|
|
||||||
stream_read_uint16(data_in, wNumberOfFormats);
|
|
||||||
stream_read_uint8(data_in, rdpsnd->cBlockNo); /* cLastBlockConfirmed */
|
|
||||||
stream_read_uint16(data_in, wVersion);
|
|
||||||
stream_seek_uint8(data_in); /* bPad */
|
|
||||||
|
|
||||||
out_formats = (rdpsndFormat*)
|
|
||||||
xzalloc(wNumberOfFormats * sizeof(rdpsndFormat));
|
|
||||||
|
|
||||||
n_out_formats = 0;
|
|
||||||
|
|
||||||
data_out = stream_new(24);
|
|
||||||
stream_write_uint8(data_out, SNDC_FORMATS); /* msgType */
|
|
||||||
stream_write_uint8(data_out, 0); /* bPad */
|
|
||||||
stream_seek_uint16(data_out); /* BodySize */
|
|
||||||
stream_write_uint32(data_out, TSSNDCAPS_ALIVE); /* dwFlags */
|
|
||||||
stream_write_uint32(data_out, 0); /* dwVolume */
|
|
||||||
stream_write_uint32(data_out, 0); /* dwPitch */
|
|
||||||
stream_write_uint16_be(data_out, 0); /* wDGramPort */
|
|
||||||
stream_seek_uint16(data_out); /* wNumberOfFormats */
|
|
||||||
stream_write_uint8(data_out, 0); /* cLastBlockConfirmed */
|
|
||||||
stream_write_uint16(data_out, 6); /* wVersion */
|
|
||||||
stream_write_uint8(data_out, 0); /* bPad */
|
|
||||||
|
|
||||||
for (nFormat = 0; nFormat < wNumberOfFormats; nFormat++) {
|
|
||||||
|
|
||||||
stream_get_mark(data_in, format_mark);
|
|
||||||
format = &out_formats[n_out_formats];
|
|
||||||
stream_read_uint16(data_in, format->wFormatTag);
|
|
||||||
stream_read_uint16(data_in, format->nChannels);
|
|
||||||
stream_read_uint32(data_in, format->nSamplesPerSec);
|
|
||||||
stream_seek_uint32(data_in); /* nAvgBytesPerSec */
|
|
||||||
stream_read_uint16(data_in, format->nBlockAlign);
|
|
||||||
stream_read_uint16(data_in, format->wBitsPerSample);
|
|
||||||
stream_read_uint16(data_in, format->cbSize);
|
|
||||||
stream_get_mark(data_in, data_mark);
|
|
||||||
stream_seek(data_in, format->cbSize);
|
|
||||||
format->data = NULL;
|
|
||||||
|
|
||||||
if (format->wFormatTag == WAVE_FORMAT_PCM) {
|
|
||||||
|
|
||||||
guac_client_log_info(client,
|
|
||||||
"Accepted format: %i-bit PCM with %i channels at "
|
|
||||||
"%i Hz",
|
|
||||||
format->wBitsPerSample,
|
|
||||||
format->nChannels,
|
|
||||||
format->nSamplesPerSec);
|
|
||||||
|
|
||||||
stream_check_size(data_out, 18 + format->cbSize);
|
|
||||||
stream_write(data_out, format_mark, 18 + format->cbSize);
|
|
||||||
if (format->cbSize > 0)
|
|
||||||
{
|
|
||||||
format->data = xmalloc(format->cbSize);
|
|
||||||
memcpy(format->data, data_mark, format->cbSize);
|
|
||||||
}
|
|
||||||
n_out_formats++;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
xfree(out_formats);
|
|
||||||
|
|
||||||
pos = stream_get_pos(data_out);
|
|
||||||
stream_set_pos(data_out, 2);
|
|
||||||
stream_write_uint16(data_out, pos - 4);
|
|
||||||
stream_set_pos(data_out, 18);
|
|
||||||
stream_write_uint16(data_out, n_out_formats);
|
|
||||||
stream_set_pos(data_out, pos);
|
|
||||||
|
|
||||||
svc_plugin_send((rdpSvcPlugin*)rdpsnd, data_out);
|
|
||||||
|
|
||||||
if (wVersion >= 6) {
|
|
||||||
|
|
||||||
/* Respond with guality mode */
|
|
||||||
data_out = stream_new(8);
|
|
||||||
stream_write_uint8(data_out, SNDC_QUALITYMODE); /* msgType */
|
|
||||||
stream_write_uint8(data_out, 0); /* bPad */
|
|
||||||
stream_write_uint16(data_out, 4); /* BodySize */
|
|
||||||
stream_write_uint16(data_out, HIGH_QUALITY); /* wQualityMode */
|
|
||||||
stream_write_uint16(data_out, 0); /* Reserved */
|
|
||||||
|
|
||||||
svc_plugin_send((rdpSvcPlugin*)rdpsnd, data_out);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/* server is getting a feel of the round trip time */
|
|
||||||
void guac_rdpsnd_process_message_training(guac_rdpsndPlugin* rdpsnd,
|
|
||||||
STREAM* data_in) {
|
|
||||||
|
|
||||||
uint16 wTimeStamp;
|
|
||||||
uint16 wPackSize;
|
|
||||||
STREAM* data_out;
|
|
||||||
|
|
||||||
/* Read timestamp */
|
|
||||||
stream_read_uint16(data_in, wTimeStamp);
|
|
||||||
stream_read_uint16(data_in, wPackSize);
|
|
||||||
|
|
||||||
/* Send training response */
|
|
||||||
data_out = stream_new(8);
|
|
||||||
stream_write_uint8(data_out, SNDC_TRAINING); /* msgType */
|
|
||||||
stream_write_uint8(data_out, 0); /* bPad */
|
|
||||||
stream_write_uint16(data_out, 4); /* BodySize */
|
|
||||||
stream_write_uint16(data_out, wTimeStamp);
|
|
||||||
stream_write_uint16(data_out, wPackSize);
|
|
||||||
|
|
||||||
svc_plugin_send((rdpSvcPlugin*) rdpsnd, data_out);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
void guac_rdpsnd_process_message_wave_info(guac_rdpsndPlugin* rdpsnd, STREAM* data_in, uint16 BodySize) {
|
|
||||||
|
|
||||||
uint16 wFormatNo;
|
|
||||||
|
|
||||||
/* Read wave information */
|
|
||||||
stream_read_uint16(data_in, rdpsnd->wTimeStamp);
|
|
||||||
stream_read_uint16(data_in, wFormatNo);
|
|
||||||
stream_read_uint8(data_in, rdpsnd->cBlockNo);
|
|
||||||
stream_seek(data_in, 3); /* bPad */
|
|
||||||
stream_read(data_in, rdpsnd->waveData, 4);
|
|
||||||
|
|
||||||
/* Read wave in next iteration */
|
|
||||||
rdpsnd->waveDataSize = BodySize - 8;
|
|
||||||
rdpsnd->expectingWave = true;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/* header is not removed from data in this function */
|
|
||||||
void rdpsnd_process_message_wave(guac_rdpsndPlugin* rdpsnd,
|
|
||||||
STREAM* data_in) {
|
|
||||||
|
|
||||||
rdpSvcPlugin* plugin = (rdpSvcPlugin*)rdpsnd;
|
|
||||||
|
|
||||||
/* Get client from plugin */
|
|
||||||
guac_client* client = (guac_client*)
|
|
||||||
plugin->channel_entry_points.pExtendedData;
|
|
||||||
|
|
||||||
STREAM* data_out;
|
|
||||||
|
|
||||||
int size;
|
|
||||||
unsigned char* buffer;
|
|
||||||
|
|
||||||
rdpsnd->expectingWave = 0;
|
|
||||||
memcpy(stream_get_head(data_in), rdpsnd->waveData, 4);
|
|
||||||
if (stream_get_size(data_in) != rdpsnd->waveDataSize) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
buffer = stream_get_head(data_in);
|
|
||||||
size = stream_get_size(data_in);
|
|
||||||
|
|
||||||
guac_client_log_info(client, "Got sound: %i bytes.", size);
|
|
||||||
|
|
||||||
data_out = stream_new(8);
|
|
||||||
stream_write_uint8(data_out, SNDC_WAVECONFIRM);
|
|
||||||
stream_write_uint8(data_out, 0);
|
|
||||||
stream_write_uint16(data_out, 4);
|
|
||||||
stream_write_uint16(data_out, rdpsnd->wTimeStamp);
|
|
||||||
stream_write_uint8(data_out, rdpsnd->cBlockNo); /* cConfirmedBlockNo */
|
|
||||||
stream_write_uint8(data_out, 0); /* bPad */
|
|
||||||
|
|
||||||
svc_plugin_send(plugin, data_out);
|
|
||||||
rdpsnd->plugin.interval_ms = 10;
|
|
||||||
}
|
|
||||||
|
|
||||||
void guac_rdpsnd_process_connect(rdpSvcPlugin* plugin) {
|
void guac_rdpsnd_process_connect(rdpSvcPlugin* plugin) {
|
||||||
|
|
||||||
@ -281,19 +49,6 @@ void guac_rdpsnd_process_connect(rdpSvcPlugin* plugin) {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void guac_rdpsnd_process_message_setvolume(guac_rdpsndPlugin* rdpsnd,
|
|
||||||
STREAM* data_in) {
|
|
||||||
|
|
||||||
/* Ignored for now */
|
|
||||||
uint32 dwVolume;
|
|
||||||
stream_read_uint32(data_in, dwVolume);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
void guac_rdpsnd_process_message_close(guac_rdpsndPlugin* rdpsnd) {
|
|
||||||
rdpsnd->plugin.interval_ms = 10;
|
|
||||||
}
|
|
||||||
|
|
||||||
void guac_rdpsnd_process_terminate(rdpSvcPlugin* plugin) {
|
void guac_rdpsnd_process_terminate(rdpSvcPlugin* plugin) {
|
||||||
xfree(plugin);
|
xfree(plugin);
|
||||||
}
|
}
|
||||||
@ -302,6 +57,250 @@ void guac_rdpsnd_process_event(rdpSvcPlugin* plugin, RDP_EVENT* event) {
|
|||||||
freerdp_event_free(event);
|
freerdp_event_free(event);
|
||||||
}
|
}
|
||||||
|
|
||||||
DEFINE_SVC_PLUGIN(guac_rdpsnd, "rdpsnd",
|
void guac_rdpsnd_process_receive(rdpSvcPlugin* plugin,
|
||||||
CHANNEL_OPTION_INITIALIZED | CHANNEL_OPTION_ENCRYPT_RDP)
|
STREAM* input_stream) {
|
||||||
|
|
||||||
|
guac_rdpsndPlugin* rdpsnd = (guac_rdpsndPlugin*) plugin;
|
||||||
|
|
||||||
|
/* Get client from plugin */
|
||||||
|
guac_client* client = (guac_client*)
|
||||||
|
plugin->channel_entry_points.pExtendedData;
|
||||||
|
|
||||||
|
uint8 msgType;
|
||||||
|
uint16 BodySize;
|
||||||
|
|
||||||
|
if (rdpsnd->expectingWave) {
|
||||||
|
rdpsnd_process_message_wave(rdpsnd, client, input_stream);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Read event */
|
||||||
|
stream_read_uint8(input_stream, msgType); /* msgType */
|
||||||
|
stream_seek_uint8(input_stream); /* bPad */
|
||||||
|
stream_read_uint16(input_stream, BodySize);
|
||||||
|
|
||||||
|
switch (msgType) {
|
||||||
|
|
||||||
|
case SNDC_FORMATS:
|
||||||
|
guac_rdpsnd_process_message_formats(rdpsnd, client, input_stream);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case SNDC_TRAINING:
|
||||||
|
guac_rdpsnd_process_message_training(rdpsnd, client, input_stream);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case SNDC_WAVE:
|
||||||
|
guac_rdpsnd_process_message_wave_info(rdpsnd, client, input_stream, BodySize);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case SNDC_CLOSE:
|
||||||
|
guac_rdpsnd_process_message_close(rdpsnd, client);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case SNDC_SETVOLUME:
|
||||||
|
guac_rdpsnd_process_message_setvolume(rdpsnd, client, input_stream);
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
/*DEBUG_WARN("unknown msgType %d", msgType);*/
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/* MESSAGE HANDLERS */
|
||||||
|
|
||||||
|
/* receives a list of server supported formats and returns a list
|
||||||
|
of client supported formats */
|
||||||
|
void guac_rdpsnd_process_message_formats(guac_rdpsndPlugin* rdpsnd,
|
||||||
|
guac_client* client, STREAM* input_stream) {
|
||||||
|
|
||||||
|
uint16 wNumberOfFormats;
|
||||||
|
uint16 nFormat;
|
||||||
|
uint16 wVersion;
|
||||||
|
STREAM* output_stream;
|
||||||
|
rdpsndFormat* out_formats;
|
||||||
|
uint16 n_out_formats;
|
||||||
|
rdpsndFormat* format;
|
||||||
|
uint8* format_mark;
|
||||||
|
uint8* data_mark;
|
||||||
|
int pos;
|
||||||
|
|
||||||
|
stream_seek_uint32(input_stream); /* dwFlags */
|
||||||
|
stream_seek_uint32(input_stream); /* dwVolume */
|
||||||
|
stream_seek_uint32(input_stream); /* dwPitch */
|
||||||
|
stream_seek_uint16(input_stream); /* wDGramPort */
|
||||||
|
stream_read_uint16(input_stream, wNumberOfFormats);
|
||||||
|
stream_read_uint8(input_stream, rdpsnd->cBlockNo); /* cLastBlockConfirmed */
|
||||||
|
stream_read_uint16(input_stream, wVersion);
|
||||||
|
stream_seek_uint8(input_stream); /* bPad */
|
||||||
|
|
||||||
|
out_formats = (rdpsndFormat*)
|
||||||
|
xzalloc(wNumberOfFormats * sizeof(rdpsndFormat));
|
||||||
|
|
||||||
|
n_out_formats = 0;
|
||||||
|
|
||||||
|
output_stream = stream_new(24);
|
||||||
|
stream_write_uint8(output_stream, SNDC_FORMATS); /* msgType */
|
||||||
|
stream_write_uint8(output_stream, 0); /* bPad */
|
||||||
|
stream_seek_uint16(output_stream); /* BodySize */
|
||||||
|
stream_write_uint32(output_stream, TSSNDCAPS_ALIVE); /* dwFlags */
|
||||||
|
stream_write_uint32(output_stream, 0); /* dwVolume */
|
||||||
|
stream_write_uint32(output_stream, 0); /* dwPitch */
|
||||||
|
stream_write_uint16_be(output_stream, 0); /* wDGramPort */
|
||||||
|
stream_seek_uint16(output_stream); /* wNumberOfFormats */
|
||||||
|
stream_write_uint8(output_stream, 0); /* cLastBlockConfirmed */
|
||||||
|
stream_write_uint16(output_stream, 6); /* wVersion */
|
||||||
|
stream_write_uint8(output_stream, 0); /* bPad */
|
||||||
|
|
||||||
|
for (nFormat = 0; nFormat < wNumberOfFormats; nFormat++) {
|
||||||
|
|
||||||
|
stream_get_mark(input_stream, format_mark);
|
||||||
|
format = &out_formats[n_out_formats];
|
||||||
|
stream_read_uint16(input_stream, format->wFormatTag);
|
||||||
|
stream_read_uint16(input_stream, format->nChannels);
|
||||||
|
stream_read_uint32(input_stream, format->nSamplesPerSec);
|
||||||
|
stream_seek_uint32(input_stream); /* nAvgBytesPerSec */
|
||||||
|
stream_read_uint16(input_stream, format->nBlockAlign);
|
||||||
|
stream_read_uint16(input_stream, format->wBitsPerSample);
|
||||||
|
stream_read_uint16(input_stream, format->cbSize);
|
||||||
|
stream_get_mark(input_stream, data_mark);
|
||||||
|
stream_seek(input_stream, format->cbSize);
|
||||||
|
format->data = NULL;
|
||||||
|
|
||||||
|
if (format->wFormatTag == WAVE_FORMAT_PCM) {
|
||||||
|
|
||||||
|
guac_client_log_info(client,
|
||||||
|
"Accepted format: %i-bit PCM with %i channels at "
|
||||||
|
"%i Hz",
|
||||||
|
format->wBitsPerSample,
|
||||||
|
format->nChannels,
|
||||||
|
format->nSamplesPerSec);
|
||||||
|
|
||||||
|
stream_check_size(output_stream, 18 + format->cbSize);
|
||||||
|
stream_write(output_stream, format_mark, 18 + format->cbSize);
|
||||||
|
if (format->cbSize > 0)
|
||||||
|
{
|
||||||
|
format->data = xmalloc(format->cbSize);
|
||||||
|
memcpy(format->data, data_mark, format->cbSize);
|
||||||
|
}
|
||||||
|
n_out_formats++;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
xfree(out_formats);
|
||||||
|
|
||||||
|
pos = stream_get_pos(output_stream);
|
||||||
|
stream_set_pos(output_stream, 2);
|
||||||
|
stream_write_uint16(output_stream, pos - 4);
|
||||||
|
stream_set_pos(output_stream, 18);
|
||||||
|
stream_write_uint16(output_stream, n_out_formats);
|
||||||
|
stream_set_pos(output_stream, pos);
|
||||||
|
|
||||||
|
svc_plugin_send((rdpSvcPlugin*)rdpsnd, output_stream);
|
||||||
|
|
||||||
|
if (wVersion >= 6) {
|
||||||
|
|
||||||
|
/* Respond with guality mode */
|
||||||
|
output_stream = stream_new(8);
|
||||||
|
stream_write_uint8(output_stream, SNDC_QUALITYMODE); /* msgType */
|
||||||
|
stream_write_uint8(output_stream, 0); /* bPad */
|
||||||
|
stream_write_uint16(output_stream, 4); /* BodySize */
|
||||||
|
stream_write_uint16(output_stream, HIGH_QUALITY); /* wQualityMode */
|
||||||
|
stream_write_uint16(output_stream, 0); /* Reserved */
|
||||||
|
|
||||||
|
svc_plugin_send((rdpSvcPlugin*)rdpsnd, output_stream);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/* server is getting a feel of the round trip time */
|
||||||
|
void guac_rdpsnd_process_message_training(guac_rdpsndPlugin* rdpsnd,
|
||||||
|
guac_client* client, STREAM* input_stream) {
|
||||||
|
|
||||||
|
uint16 wTimeStamp;
|
||||||
|
uint16 wPackSize;
|
||||||
|
STREAM* output_stream;
|
||||||
|
|
||||||
|
/* Read timestamp */
|
||||||
|
stream_read_uint16(input_stream, wTimeStamp);
|
||||||
|
stream_read_uint16(input_stream, wPackSize);
|
||||||
|
|
||||||
|
/* Send training response */
|
||||||
|
output_stream = stream_new(8);
|
||||||
|
stream_write_uint8(output_stream, SNDC_TRAINING); /* msgType */
|
||||||
|
stream_write_uint8(output_stream, 0); /* bPad */
|
||||||
|
stream_write_uint16(output_stream, 4); /* BodySize */
|
||||||
|
stream_write_uint16(output_stream, wTimeStamp);
|
||||||
|
stream_write_uint16(output_stream, wPackSize);
|
||||||
|
|
||||||
|
svc_plugin_send((rdpSvcPlugin*) rdpsnd, output_stream);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
void guac_rdpsnd_process_message_wave_info(guac_rdpsndPlugin* rdpsnd, guac_client* client, STREAM* input_stream, uint16 BodySize) {
|
||||||
|
|
||||||
|
uint16 wFormatNo;
|
||||||
|
|
||||||
|
/* Read wave information */
|
||||||
|
stream_read_uint16(input_stream, rdpsnd->wTimeStamp);
|
||||||
|
stream_read_uint16(input_stream, wFormatNo);
|
||||||
|
stream_read_uint8(input_stream, rdpsnd->cBlockNo);
|
||||||
|
stream_seek(input_stream, 3); /* bPad */
|
||||||
|
stream_read(input_stream, rdpsnd->waveData, 4);
|
||||||
|
|
||||||
|
/* Read wave in next iteration */
|
||||||
|
rdpsnd->waveDataSize = BodySize - 8;
|
||||||
|
rdpsnd->expectingWave = true;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/* header is not removed from data in this function */
|
||||||
|
void rdpsnd_process_message_wave(guac_rdpsndPlugin* rdpsnd,
|
||||||
|
guac_client* client, STREAM* input_stream) {
|
||||||
|
|
||||||
|
rdpSvcPlugin* plugin = (rdpSvcPlugin*)rdpsnd;
|
||||||
|
|
||||||
|
STREAM* output_stream;
|
||||||
|
|
||||||
|
int size;
|
||||||
|
unsigned char* buffer;
|
||||||
|
|
||||||
|
rdpsnd->expectingWave = 0;
|
||||||
|
memcpy(stream_get_head(input_stream), rdpsnd->waveData, 4);
|
||||||
|
if (stream_get_size(input_stream) != rdpsnd->waveDataSize) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
buffer = stream_get_head(input_stream);
|
||||||
|
size = stream_get_size(input_stream);
|
||||||
|
|
||||||
|
guac_client_log_info(client, "Got sound: %i bytes.", size);
|
||||||
|
|
||||||
|
output_stream = stream_new(8);
|
||||||
|
stream_write_uint8(output_stream, SNDC_WAVECONFIRM);
|
||||||
|
stream_write_uint8(output_stream, 0);
|
||||||
|
stream_write_uint16(output_stream, 4);
|
||||||
|
stream_write_uint16(output_stream, rdpsnd->wTimeStamp);
|
||||||
|
stream_write_uint8(output_stream, rdpsnd->cBlockNo); /* cConfirmedBlockNo */
|
||||||
|
stream_write_uint8(output_stream, 0); /* bPad */
|
||||||
|
|
||||||
|
svc_plugin_send(plugin, output_stream);
|
||||||
|
rdpsnd->plugin.interval_ms = 10;
|
||||||
|
}
|
||||||
|
|
||||||
|
void guac_rdpsnd_process_message_setvolume(guac_rdpsndPlugin* rdpsnd,
|
||||||
|
guac_client* client, STREAM* input_stream) {
|
||||||
|
|
||||||
|
/* Ignored for now */
|
||||||
|
uint32 dwVolume;
|
||||||
|
stream_read_uint32(input_stream, dwVolume);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
void guac_rdpsnd_process_message_close(guac_rdpsndPlugin* rdpsnd,
|
||||||
|
guac_client* client) {
|
||||||
|
rdpsnd->plugin.interval_ms = 10;
|
||||||
|
}
|
||||||
|
|
||||||
|
|||||||
@ -59,51 +59,42 @@ typedef struct guac_rdpsndPlugin {
|
|||||||
rdpSvcPlugin plugin;
|
rdpSvcPlugin plugin;
|
||||||
|
|
||||||
uint8 cBlockNo;
|
uint8 cBlockNo;
|
||||||
rdpsndFormat* supported_formats;
|
|
||||||
int n_supported_formats;
|
|
||||||
int current_format;
|
|
||||||
|
|
||||||
boolean expectingWave;
|
boolean expectingWave;
|
||||||
uint8 waveData[4];
|
uint8 waveData[4];
|
||||||
uint16 waveDataSize;
|
uint16 waveDataSize;
|
||||||
uint32 wTimeStamp; /* server timestamp */
|
uint32 wTimeStamp; /* server timestamp */
|
||||||
uint32 wave_timestamp; /* client timestamp */
|
|
||||||
|
|
||||||
boolean is_open;
|
|
||||||
uint32 close_timestamp;
|
|
||||||
|
|
||||||
uint16 fixed_format;
|
|
||||||
uint16 fixed_channel;
|
|
||||||
uint32 fixed_rate;
|
|
||||||
int latency;
|
|
||||||
|
|
||||||
} guac_rdpsndPlugin ;
|
} guac_rdpsndPlugin ;
|
||||||
|
|
||||||
void guac_rdpsnd_process_receive(rdpSvcPlugin* plugin,
|
|
||||||
STREAM* data_in);
|
|
||||||
|
|
||||||
void guac_rdpsnd_process_message_formats(guac_rdpsndPlugin* rdpsnd,
|
|
||||||
STREAM* data_in);
|
|
||||||
|
|
||||||
void guac_rdpsnd_process_message_training(guac_rdpsndPlugin* rdpsnd,
|
|
||||||
STREAM* data_in);
|
|
||||||
|
|
||||||
void guac_rdpsnd_process_message_wave_info(guac_rdpsndPlugin* rdpsnd,
|
|
||||||
STREAM* data_in, uint16 BodySize);
|
|
||||||
|
|
||||||
void rdpsnd_process_message_wave(guac_rdpsndPlugin* rdpsnd,
|
|
||||||
STREAM* data_in);
|
|
||||||
|
|
||||||
void guac_rdpsnd_process_connect(rdpSvcPlugin* plugin);
|
void guac_rdpsnd_process_connect(rdpSvcPlugin* plugin);
|
||||||
|
|
||||||
void guac_rdpsnd_process_message_setvolume(guac_rdpsndPlugin* rdpsnd,
|
void guac_rdpsnd_process_receive(rdpSvcPlugin* plugin,
|
||||||
STREAM* data_in);
|
STREAM* data_in);
|
||||||
|
|
||||||
void guac_rdpsnd_process_message_close(guac_rdpsndPlugin* rdpsnd);
|
|
||||||
|
|
||||||
void guac_rdpsnd_process_terminate(rdpSvcPlugin* plugin);
|
void guac_rdpsnd_process_terminate(rdpSvcPlugin* plugin);
|
||||||
|
|
||||||
void guac_rdpsnd_process_event(rdpSvcPlugin* plugin, RDP_EVENT* event);
|
void guac_rdpsnd_process_event(rdpSvcPlugin* plugin, RDP_EVENT* event);
|
||||||
|
|
||||||
|
|
||||||
|
void guac_rdpsnd_process_message_formats(guac_rdpsndPlugin* rdpsnd,
|
||||||
|
guac_client* client, STREAM* data_in);
|
||||||
|
|
||||||
|
void guac_rdpsnd_process_message_training(guac_rdpsndPlugin* rdpsnd,
|
||||||
|
guac_client* client, STREAM* data_in);
|
||||||
|
|
||||||
|
void guac_rdpsnd_process_message_wave_info(guac_rdpsndPlugin* rdpsnd,
|
||||||
|
guac_client* client, STREAM* data_in, uint16 BodySize);
|
||||||
|
|
||||||
|
void rdpsnd_process_message_wave(guac_rdpsndPlugin* rdpsnd,
|
||||||
|
guac_client* client, STREAM* data_in);
|
||||||
|
|
||||||
|
void guac_rdpsnd_process_message_setvolume(guac_rdpsndPlugin* rdpsnd,
|
||||||
|
guac_client* client, STREAM* data_in);
|
||||||
|
|
||||||
|
void guac_rdpsnd_process_message_close(guac_rdpsndPlugin* rdpsnd,
|
||||||
|
guac_client* client);
|
||||||
|
|
||||||
#endif /* __RDPSND_MAIN_H */
|
#endif /* __RDPSND_MAIN_H */
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user