Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-10 08:38:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] spice: correct issue with new channel list support

Browse Source
This commit is contained in:
Geoffrey McRae 2019-02-21 05:31:51 +11:00
parent daf854c692
commit 07e4c1c20f
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
client/spice/messages.h
View File

@ -40,10 +40,17 @@ typedef struct SpiceMsgMainInit
} }
SpiceMsgMainInit; SpiceMsgMainInit;
typedef struct SpiceChannelID
{
uint8_t type;
uint8_t channel_id;
}
SpiceChannelID;
typedef struct SpiceMsgMainChannelsList typedef struct SpiceMsgMainChannelsList
{ {
uint32_t num_of_channels; uint32_t num_of_channels;
//uint8_t channels[num_of_channels] //SpiceChannelID channels[num_of_channels]
} }
SpiceMainChannelsList; SpiceMainChannelsList;

8
client/spice/spice.c
View File

@ -442,8 +442,8 @@ bool spice_on_main_channel_read()
} }
// documentation doesn't state that the array is null terminated but it seems that it is // documentation doesn't state that the array is null terminated but it seems that it is
uint8_t channels[msg.num_of_channels+1]; SpiceChannelID channels[msg.num_of_channels];
if (!spice_read(channel, &channels, msg.num_of_channels+1)) if (!spice_read(channel, &channels, msg.num_of_channels * sizeof(SpiceChannelID)))
{ {
DEBUG_ERROR("Failed to read channel list vector"); DEBUG_ERROR("Failed to read channel list vector");
spice_disconnect(); spice_disconnect();
@ -452,8 +452,8 @@ bool spice_on_main_channel_read()
for(int i = 0; i < msg.num_of_channels; ++i) for(int i = 0; i < msg.num_of_channels; ++i)
{ {
DEBUG_PROTO("channel %d = %u", i, channels[i]); DEBUG_PROTO("channel %d = %u", i, channels[i].type);
if (channels[i] == SPICE_CHANNEL_INPUTS) if (channels[i].type == SPICE_CHANNEL_INPUTS)
{ {
if (spice.scInputs.connected) if (spice.scInputs.connected)
{ {