LX3JL/xlxd
1
0
Fork 0
mirror of https://github.com/LX3JL/xlxd.git synced 2025-12-06 07:42:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

corrected deadloop in CImrsProtocol::EncodePongPacket()

Browse source
This commit is contained in:
LX3JL 2021-10-30 23:09:48 +02:00
parent b411eb8b8a
commit c3de5fa893
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/cimrsprotocol.cpp
View file

@ -660,8 +660,8 @@ void CImrsProtocol::EncodePongPacket(CBuffer *Buffer) const
// enable dg-id 2 & 10 -> 10+NBmodules // enable dg-id 2 & 10 -> 10+NBmodules
uint32 dgids32 = 0x00000004; uint32 dgids32 = 0x00000004;
uint32 mask32 = 0x00000400; uint32 mask32 = 0x00000400;
// modules 10->31 // modules 10->31
for ( int i = 0; i < MIN(NB_OF_MODULES,22); i++ ) for ( int i = 0; i < (int)(MIN(NB_OF_MODULES,22)); i++ )
{ {
dgids32 |= mask32; dgids32 |= mask32;
mask32 = mask32 << 1; mask32 = mask32 << 1;
@ -673,11 +673,10 @@ void CImrsProtocol::EncodePongPacket(CBuffer *Buffer) const
// module 32->35 // module 32->35
uint8 dgids8 = 0x00; uint8 dgids8 = 0x00;
uint8 mask8 = 0x01; uint8 mask8 = 0x01;
for ( int i = 23; i < NB_OF_MODULES; i++ ) for ( int i = 22; i < NB_OF_MODULES; i++ )
{ {
dgids8 |= mask8; dgids8 |= mask8;
mask8 = mask8 << 1; mask8 = mask8 << 1;
} }
Buffer->Append(dgids8); Buffer->Append(dgids8);
Buffer->Append((uint8)0x00, 12); Buffer->Append((uint8)0x00, 12);