More unittests for commsdsl2wireshark.

Author: arobenko

app/commsdsl2comms/src/CommsEnumField.cpp

@@ -1220,6 +1220,10 @@ void CommsEnumField::commsAddLengthOptInternal(GenStringsList& opts) const
         return;
     }
 
+    if (obj.parseMinLength() != obj.parseMaxLength()) {
+        return;
+    }
+
     static const unsigned LengthMap[] = {
         /* Int8 */ 1,
         /* Uint8 */ 1,

app/commsdsl2comms/src/CommsIntField.cpp

@@ -771,6 +771,10 @@ void CommsIntField::commsAddLengthOptInternal(GenStringsList& opts) const
         return;
     }
 
+    if (obj.parseMinLength() != obj.parseMaxLength()) {
+        return;
+    }
+
     static const unsigned LengthMap[] = {
         /* Int8 */ 1,
         /* Uint8 */ 1,

app/commsdsl2comms/src/CommsSetField.cpp

@@ -701,13 +701,18 @@ std::string CommsSetField::commsDefBitNameFuncCodeInternal() const
 
 void CommsSetField::commsAddLengthOptInternal(commsdsl::gen::util::GenStringsList& opts) const
 {
-    auto bitLength = genParseObj().parseBitLength();
+    auto obj = genSetFieldParseObj();
+    auto bitLength = obj.parseBitLength();
     if (bitLength != 0U) {
         opts.push_back("comms::option::def::FixedBitLength<" + util::genNumToString(bitLength) + '>');
         return;
     }
 
-    opts.push_back("comms::option::def::FixedLength<" + util::genNumToString(genSetFieldParseObj().parseMinLength()) + '>');
+    if (obj.parseMinLength() != obj.parseMaxLength()) {
+        return;
+    }
+
+    opts.push_back("comms::option::def::FixedLength<" + util::genNumToString(obj.parseMinLength()) + '>');
 }
 
 void CommsSetField::commsAddDefaultValueOptInternal(commsdsl::gen::util::GenStringsList& opts) const

app/commsdsl2wireshark/src/WiresharkEnumField.cpp

@@ -119,6 +119,10 @@ std::string WiresharkEnumField::wiresharkDissectBodyImpl(const WiresharkField* r
         {"TVB", wiresharkTvbStr()},
     };
 
+    if (parseObj.parseAvailableLengthLimit()) {
+        repl["LEN"] = std::to_string(wiresharkMaxFieldLength(refField));
+    }
+
     if (parseObj.parseEndian() == commsdsl::parse::ParseEndian_Little) {
         repl["SUFFIX"] = strings::genLittleEndianSuffixStr();
     }

app/commsdsl2wireshark/src/WiresharkField.cpp

@@ -1343,7 +1343,7 @@ std::string WiresharkField::wiresharkUnitNameString(commsdsl::parse::ParseUnits
 std::string WiresharkField::wiresharkEmptyBufferCheckCode() const
 {
     static const std::string Templ =
-        "if offset == offset_limit then"
+        "if offset == offset_limit then\n"
         "    return #^#ERROR#$#, offset\n"
         "end"
         ;

app/commsdsl2wireshark/src/WiresharkIntField.cpp

@@ -224,6 +224,10 @@ std::string WiresharkIntField::wiresharkDissectBodyImpl(const WiresharkField* re
         {"TREE", wiresharkTreeStr()},
     };
 
+    if (parseObj.parseAvailableLengthLimit()) {
+        repl["LEN"] = std::to_string(wiresharkMaxFieldLength(refField));
+    }
+
     if (parseObj.parseEndian() == commsdsl::parse::ParseEndian_Little) {
         repl["SUFFIX"] = strings::genLittleEndianSuffixStr();
     }

app/commsdsl2wireshark/src/WiresharkSetField.cpp

@@ -143,6 +143,10 @@ std::string WiresharkSetField::wiresharkDissectBodyImpl(const WiresharkField* re
         {"RANGE", wiresharkRangeStr()},
     };
 
+    if (parseObj.parseAvailableLengthLimit()) {
+        repl["LEN"] = std::to_string(wiresharkMaxFieldLength(refField));
+    }
+
     if (parseObj.parseEndian() == commsdsl::parse::ParseEndian_Little) {
         repl["SUFFIX"] = strings::genLittleEndianSuffixStr();
     }

app/commsdsl2wireshark/test/test32/src/test32.lua-test32_local.field_ComplexLength_value.replace

@@ -3,4 +3,4 @@ if short_val ~= 0xff then
     return short_val
 end
 
-return test32_local.field_ComplexLengthMembers_Long_value()
+return test32_local.field_ComplexLengthMembers_LongMembers_ActLong_value()

app/commsdsl2wireshark/test/test32/test32.py

@@ -0,0 +1,40 @@
+import sys
+
+from commsdsl_pcap_gen import *
+
+def do_frame(id, payload):
+    prefix = struct.pack('>B', id)
+    return prefix + payload
+
+def pcap1(f):
+    seq = 1000
+    msg1_payload = struct.pack('>BBIH', 4, 4, 0, 0xffff)
+    msg1 = do_frame(1, msg1_payload)
+    header = commsdsl_create_ethernet_ip_tcp_headers(len(msg1), seq)
+    commsdsl_write_packet(f, header + msg1, time.time())
+
+def pcap2(f):
+    seq = 2000
+    msg2_payload = struct.pack('>BBBHBH', 1, 1, 2, 1, 2, 1)
+    msg2 = do_frame(2, msg2_payload)
+    header = commsdsl_create_ethernet_ip_tcp_headers(len(msg2), seq)
+    commsdsl_write_packet(f, header + msg2, time.time())
+
+def pcap3(f):
+    seq = 3000
+    msg3_payload1 = struct.pack('>BBHH', 0, 2, 1, 0xabcd)
+    msg3_1 = do_frame(3, msg3_payload1)
+    msg3_payload2 = struct.pack('>BBH300sH', 5, 0xff, 300, b'a' * 300, 0xabcd)
+    msg3_2 = do_frame(3, msg3_payload2)
+    header = commsdsl_create_ethernet_ip_tcp_headers(len(msg3_1) + len(msg3_2), seq)
+    commsdsl_write_packet(f, header + msg3_1 + msg3_2, time.time())
+
+def main():
+    with open(sys.argv[1], 'wb') as f:
+        commsdsl_write_pcap_header(f)
+        pcap1(f)
+        pcap2(f)
+        pcap3(f)
+
+if __name__ == '__main__':
+    main()

app/commsdsl2wireshark/test/test33/test33.py

@@ -0,0 +1,26 @@
+import sys
+
+from commsdsl_pcap_gen import *
+
+def do_frame(id, version, payload):
+    prefix = struct.pack('>BB', id, version)
+    return prefix + payload
+
+def pcap1(f):
+    seq = 1000
+    msg1_payload1 = struct.pack('>BBBH', 1, 1, 2, 0xabcd)
+    msg1_1 = do_frame(1, 3, msg1_payload1)
+    msg1_payload2 = struct.pack('>BBBIH', 1, 5, 2, 3, 0xabcd)
+    msg1_2 = do_frame(1, 5, msg1_payload2)
+    msg1_payload3 = struct.pack('>BBBIH', 1, 5, 2, 3, 0xabcd)
+    msg1_3 = do_frame(1, 4, msg1_payload3)
+    header = commsdsl_create_ethernet_ip_tcp_headers(len(msg1_1) + len(msg1_2) + len(msg1_3), seq)
+    commsdsl_write_packet(f, header + msg1_1 + msg1_2 + msg1_3, time.time())
+
+def main():
+    with open(sys.argv[1], 'wb') as f:
+        commsdsl_write_pcap_header(f)
+        pcap1(f)
+
+if __name__ == '__main__':
+    main()