PublicMirrors/EmuLinkerSF
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bundle parse

Browse Source
This commit is contained in:
Jgunishka 2019-08-21 21:26:18 +03:00
parent d1803faa3d
commit 2d60d53d35
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/org/emulinker/kaillera/controller/v086/protocol/V086Bundle.java
View File

@ -115,8 +115,8 @@ public class V086Bundle extends ByteBufferMessage
int parsedCount = 0; int parsedCount = 0;
V086Message[] messages; V086Message[] messages;
int msgNum = buffer.getShort(1); int msgNum = buffer.getChar(1);//buffer.getShort(1); - mistake. max value of short is 0x7FFF but we need 0xFFFF
if((msgNum - 1) == (lastMessageID)){ if((msgNum - 1) == lastMessageID || msgNum == 0 && lastMessageID == 0xFFFF){// exception for 0 and 0xFFFF
messageCount = 1; messageCount = 1;
messages = new V086Message[messageCount]; messages = new V086Message[messageCount];
int messageNumber = UnsignedUtil.getUnsignedShort(buffer); int messageNumber = UnsignedUtil.getUnsignedShort(buffer);
@ -134,6 +134,16 @@ public class V086Bundle extends ByteBufferMessage
int messageNumber = UnsignedUtil.getUnsignedShort(buffer); int messageNumber = UnsignedUtil.getUnsignedShort(buffer);
if (messageNumber <= lastMessageID){ if (messageNumber <= lastMessageID){
if (messageNumber < 0x20 && lastMessageID > 0xFFDF) {
// exception when messageNumber with lower value is greater
// do nothing
}
else {
break;
}
}
else if (messageNumber > 0xFFBF && lastMessageID < 0x40) {
// exception when disorder messageNumber greater that lastMessageID
break; break;
} }