matthew/ostinato
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed a bug in IcmpProtocol::frameFieldCount() which would return incorrect values sometimes

Browse Source
This commit is contained in:
Srivats P. 2010-06-07 19:20:35 +05:30
parent 11acbf201d
commit 710eb7f836
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/icmp.cpp
View File

@ -135,12 +135,15 @@ int IcmpProtocol::fieldCount() const
int IcmpProtocol::frameFieldCount() const int IcmpProtocol::frameFieldCount() const
{ {
int count = AbstractProtocol::frameFieldCount(); int count;
if (idSeqSet.contains(fieldData(icmp_type, FieldValue).toUInt()))
count = icmp_idSeqFrameFieldCount;
else
count = icmp_commonFrameFieldCount;
if (!idSeqSet.contains(fieldData(icmp_type, FieldValue).toUInt()))
count -=2;
return count; return count;
} }
AbstractProtocol::FieldFlags IcmpProtocol::fieldFlags(int index) const AbstractProtocol::FieldFlags IcmpProtocol::fieldFlags(int index) const

7
common/icmp.h
View File

@ -55,11 +55,14 @@ private:
icmp_type = 0, icmp_type = 0,
icmp_code, icmp_code,
icmp_checksum, icmp_checksum,
icmp_identifier, icmp_commonFrameFieldCount,
icmp_identifier = icmp_commonFrameFieldCount,
icmp_sequence, icmp_sequence,
icmp_idSeqFrameFieldCount,
// Meta Fields // Meta Fields
icmp_is_override_checksum, icmp_is_override_checksum = icmp_idSeqFrameFieldCount,
icmp_fieldCount icmp_fieldCount
}; };