dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed Invalid Packets count when using "--scan" option with mstpcap utility. Thank you, Tyler Long!

Browse Source
This commit is contained in:
skarg
2016-04-05 18:55:10 +00:00
parent 85143200af
commit fcb8c0b86a
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/mstpcap/main.c
+16 -6
View File
@@ -791,12 +791,16 @@ static bool read_received_packet(
mstp_port->HeaderCRC = mstp_port->HeaderCRC =
CRC_Calc_Header(header[i], mstp_port->HeaderCRC); CRC_Calc_Header(header[i], mstp_port->HeaderCRC);
} }
if (mstp_port->HeaderCRC != 0x55) { if (mstp_port->HeaderCRC == 0x55) {
mstp_port->ReceivedInvalidFrame = true;
} else if (mstp_port->DataLength == 0) {
mstp_port->ReceivedInvalidFrame = false;
mstp_port->ReceivedValidFrame = true; mstp_port->ReceivedValidFrame = true;
mstp_port->ReceivedValidFrameNotForUs = true; mstp_port->ReceivedInvalidFrame = false;
if (mstp_port->DataLength == 0) {
mstp_port->ReceivedValidFrame = true;
mstp_port->ReceivedValidFrameNotForUs = true;
}
} else {
mstp_port->ReceivedValidFrame = false;
mstp_port->ReceivedInvalidFrame = true;
} }
if (orig_len > 8) { if (orig_len > 8) {
/* packet includes data */ /* packet includes data */
@@ -830,8 +834,14 @@ static bool read_received_packet(
CRC_Calc_Data(mstp_port->DataCRCActualMSB, mstp_port->DataCRC); CRC_Calc_Data(mstp_port->DataCRCActualMSB, mstp_port->DataCRC);
mstp_port->DataCRC = mstp_port->DataCRC =
CRC_Calc_Data(mstp_port->DataCRCActualLSB, mstp_port->DataCRC); CRC_Calc_Data(mstp_port->DataCRCActualLSB, mstp_port->DataCRC);
if (mstp_port->DataCRC != 0xF0B8) { if (mstp_port->DataCRC == 0xF0B8) {
mstp_port->ReceivedInvalidFrame = false;
mstp_port->ReceivedValidFrame = true;
mstp_port->ReceivedValidFrameNotForUs = true;
} else {
mstp_port->ReceivedInvalidFrame = true; mstp_port->ReceivedInvalidFrame = true;
mstp_port->ReceivedValidFrame = false;
mstp_port->ReceivedValidFrameNotForUs = false;
} }
} else { } else {
mstp_port->DataLength = 0; mstp_port->DataLength = 0;