More commsdsl2wireshark unit tests.

arobenko · arobenko · commit 1a1d4aa9d46f · 2026-05-24T16:44:59.000+10:00
diff --git a/app/commsdsl2comms/test/test40/Schema.xml b/app/commsdsl2comms/test/test40/Schema.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<schema name="test40"
-        id="1"
-        endian="big">
+<schema name="test40" endian="big">
     <message name="Msg1" id="1">
         <int name="Time_ns" type="uint8" units="ns" />
         <int name="Time_us" type="uint8" units="us" />
diff --git a/app/commsdsl2comms/test/test41/Schema.xml b/app/commsdsl2comms/test/test41/Schema.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<schema name="test41"
-        id="1"
-        endian="big"
-        version="2">
+<schema name="test41" endian="big" version="2">
     <fields>
         <enum name="MsgId" type="uint8" semanticType="messageId" >
             <validValue name="M1" val="1" />
diff --git a/app/commsdsl2wireshark/src/WiresharkField.cpp b/app/commsdsl2wireshark/src/WiresharkField.cpp
@@ -229,6 +229,11 @@ std::size_t WiresharkField::wiresharkMinFieldLength(const WiresharkField* refFie
     }
 
     auto parseObj = refField->wiresharkGenField().genParseObj();
+
+    if (parseObj.parseIsPseudo()) {
+        return 0U;
+    }
+
     auto len = parseObj.parseMinLength();
     auto* bitfieldParent = refField->wiresharkParentBitfield();
     if (bitfieldParent == nullptr) {
diff --git a/app/commsdsl2wireshark/src/WiresharkIdLayer.cpp b/app/commsdsl2wireshark/src/WiresharkIdLayer.cpp
@@ -43,9 +43,9 @@ std::string WiresharkIdLayer::wiresharkDissectBodyImpl() const
 {
     static const std::string Templ =
         "#^#FIELD#$#\n"
-        "local id = tvb(offset, next_offset - offset):#^#VALUE#$#\n"
+        "local id = #^#VALUE_FUNC#$#()\n"
         "local msg = #^#MAP#$#[id]\n"
-        "offset = next_offset\n"
+        "#^#OFFSET#$# = #^#NEXT_OFFSET#$#\n"
         "#^#NEXT#$#\n"
         ;
 
@@ -54,9 +54,11 @@ std::string WiresharkIdLayer::wiresharkDissectBodyImpl() const
 
     util::GenReplacementMap repl = {
         {"FIELD", wiresharkDissectFieldCode()},
-        {"VALUE", field->wiresharkTvbRangeAccess()},
         {"NEXT", wiresharkNextFuncCode()},
         {"MAP", wiresharkMsgMapNameInternal()},
+        {"VALUE_FUNC", field->wiresharkValueFuncName()},
+        {"OFFSET", WiresharkField::wiresharkOffsetStr()},
+        {"NEXT_OFFSET", WiresharkField::wiresharkNextOffsetStr()},
     };
 
     return util::genProcessTemplate(Templ, repl);
diff --git a/app/commsdsl2wireshark/src/WiresharkIntField.cpp b/app/commsdsl2wireshark/src/WiresharkIntField.cpp
@@ -207,7 +207,7 @@ std::string WiresharkIntField::wiresharkDissectBodyImpl(const WiresharkField* re
 
     auto& wiresharkGenerator = WiresharkGenerator::wiresharkCast(genGenerator());
     auto parseObj = genIntFieldParseObj();
-    bool hasVal = !wiresharkHasTrivialValidImpl();
+    bool hasVal = (!wiresharkHasTrivialValidImpl()) || parseObj.parseIsPseudo();
     util::GenReplacementMap repl = {
         {"LEN", std::to_string(wiresharkMinFieldLength(refField))},
         {"SUCCESS", Wireshark::wiresharkStatusCodeStr(wiresharkGenerator, Wireshark::WiresharkStatusCode::Success)},
@@ -467,6 +467,20 @@ std::string WiresharkIntField::wiresharkFieldAsFloatRegistrationInternal(const W
 std::string WiresharkIntField::wiresharkValDeclCodeInternal() const
 {
     auto parseObj = genIntFieldParseObj();
+
+    if (parseObj.parseIsPseudo()) {
+        static const std::string Templ =
+            "local #^#VAL#$# = #^#VALUE#$#\n"
+            ;
+
+        util::GenReplacementMap repl = {
+            {"VAL", wiresharkValStr()},
+            {"VALUE", std::to_string(parseObj.parseDefaultValue())},
+        };
+
+        return util::genProcessTemplate(Templ, repl);
+    }
+
     auto type = parseObj.parseType();
     if (genIsVarLengthType(type)) {
         static const std::string Templ =
diff --git a/app/commsdsl2wireshark/src/WiresharkListField.cpp b/app/commsdsl2wireshark/src/WiresharkListField.cpp
@@ -225,7 +225,7 @@ std::string WiresharkListField::wiresharkDissectBodyImpl([[maybe_unused]] const
             break;
         }
 
-        repl["READ"] = "-- TODO: implement";
+        repl["READ"] = wiresharkUnboundDissectInternal();
     } while (false);
 
     return util::genProcessTemplate(Templ, repl);
@@ -554,6 +554,23 @@ std::string WiresharkListField::wiresharkTermSuffixDissectInternal() const
     return util::genProcessTemplate(Templ, repl);
 }
 
+std::string WiresharkListField::wiresharkUnboundDissectInternal() const
+{
+    static const std::string Templ =
+        "while (#^#NEXT_OFFSET#$# < #^#LIMIT#$#) do\n"
+        "    #^#READ_ELEM#$#\n"
+        "end\n"
+        ;
+
+    util::GenReplacementMap repl = {
+        {"LIMIT", wiresharkOffsetLimitStr()},
+        {"NEXT_OFFSET", wiresharkNextOffsetStr()},
+        {"READ_ELEM", wiresharkDissectElemCodeInternal()},
+    };
+
+    return util::genProcessTemplate(Templ, repl);
+}
+
 std::string WiresharkListField::wiresharkElemLimitCodeInternal() const
 {
     auto parseObj = genListFieldParseObj();
diff --git a/app/commsdsl2wireshark/src/WiresharkListField.h b/app/commsdsl2wireshark/src/WiresharkListField.h
@@ -65,6 +65,7 @@ class WiresharkListField final : public commsdsl::gen::GenListField, public Wire
     std::string wiresharkCountPrefixDissectInternal() const;
     std::string wiresharkLengthPrefixDissectInternal() const;
     std::string wiresharkTermSuffixDissectInternal() const;
+    std::string wiresharkUnboundDissectInternal() const;
     std::string wiresharkElemLimitCodeInternal() const;
 
     std::vector<WiresharkField*> m_wiresharkFields;
diff --git a/app/commsdsl2wireshark/test/test38/test38.py b/app/commsdsl2wireshark/test/test38/test38.py
@@ -1,5 +1,3 @@
-from functools import reduce
-import operator
 import sys
 
 from commsdsl_pcap_gen import *
diff --git a/app/commsdsl2wireshark/test/test39/test39.py b/app/commsdsl2wireshark/test/test39/test39.py
@@ -0,0 +1,24 @@
+from functools import reduce
+import operator
+import sys
+
+from commsdsl_pcap_gen import *
+
+def do_frame(size, id, payload):
+    prefix = struct.pack('>HB', size, id)
+    return prefix + payload
+
+def pcap1(f):
+    seq = 1000
+    msg1_payload = struct.pack('>BBBBB', 1, 0x32, 4, 5, 6)
+    msg1 = do_frame(1 + len(msg1_payload), 1,  msg1_payload)
+    header = commsdsl_create_ethernet_ip_tcp_headers(len(msg1), seq)
+    commsdsl_write_packet(f, header + msg1, time.time())
+
+def main():
+    with open(sys.argv[1], 'wb') as f:
+        commsdsl_write_pcap_header(f)
+        pcap1(f)
+
+if __name__ == '__main__':
+    main()
diff --git a/app/commsdsl2wireshark/test/test40/test40.py b/app/commsdsl2wireshark/test/test40/test40.py
@@ -0,0 +1,30 @@
+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('>42B', *range(1, 43))
+    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('')
+    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 main():
+    with open(sys.argv[1], 'wb') as f:
+        commsdsl_write_pcap_header(f)
+        pcap1(f)
+        pcap2(f)
+
+if __name__ == '__main__':
+    main()
diff --git a/app/commsdsl2wireshark/test/test41/src/test41.lua-test41_local.message_Msg1_read.extend b/app/commsdsl2wireshark/test/test41/src/test41.lua-test41_local.message_Msg1_read.extend
@@ -0,0 +1,9 @@
+
+function test41_local.message_Msg1_read(tvb, tree, offset, offset_limit)
+    local result, next_offset = test41_local.message_Msg1_readOrig(tvb, tree, offset, offset_limit)
+    if result == test41_local.StatusCode.SUCCESS then
+        test41_local.prot_version_set(test41_local.field_Version_value())
+    end
+
+    return result, next_offset
+end
diff --git a/app/commsdsl2wireshark/test/test41/test41.py b/app/commsdsl2wireshark/test/test41/test41.py
@@ -0,0 +1,42 @@
+import sys
+
+from commsdsl_pcap_gen import *
+
+def do_frame(size, id, payload):
+    prefix = struct.pack('>BB', size, id)
+    return prefix + payload
+
+def pcap1(f):
+    seq = 1000
+    msg1_payload1 = struct.pack('>B', 1)
+    msg1_1 = do_frame(len(msg1_payload1) + 1, 1, msg1_payload1)
+    msg2_payload1 = struct.pack('')
+    msg2_1 = do_frame(len(msg2_payload1) + 1, 2, msg2_payload1)
+    msg1_payload2 = struct.pack('>B', 2)
+    msg1_2 = do_frame(len(msg1_payload2) + 1, 1, msg1_payload2)
+    msg2_payload2 = struct.pack('>B', 0xff)
+    msg2_2 = do_frame(len(msg2_payload2) + 1, 2, msg2_payload2)
+    header = commsdsl_create_ethernet_ip_tcp_headers(len(msg1_1) + len(msg2_1) + len(msg1_2) + len(msg2_2), seq)
+    commsdsl_write_packet(f, header + msg1_1 + msg2_1 + msg1_2 + msg2_2, time.time())
+
+def pcap2(f):
+    seq = 2000
+    msg1_payload = struct.pack('>B', 1)
+    msg1 = do_frame(len(msg1_payload) + 1, 1, msg1_payload)
+    msg2_payload = struct.pack('')
+    msg2 = do_frame(len(msg2_payload) + 1, 2, msg2_payload)
+    header = commsdsl_create_ethernet_ip_tcp_headers(len(msg1) + len(msg2), seq)
+    commsdsl_write_packet(f, header + msg1 + msg2, time.time())
+
+    seq = 3000
+    header = commsdsl_create_ethernet_ip_tcp_headers(len(msg2) + len(msg2), seq)
+    commsdsl_write_packet(f, header + msg2 + msg2, time.time())
+
+def main():
+    with open(sys.argv[1], 'wb') as f:
+        commsdsl_write_pcap_header(f)
+        pcap1(f)
+        pcap2(f)
+
+if __name__ == '__main__':
+    main()
diff --git a/app/commsdsl2wireshark/test/test42/test42.py b/app/commsdsl2wireshark/test/test42/test42.py
@@ -0,0 +1,30 @@
+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('>B', 1)
+    msg1 = do_frame(27,  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('>H', 2)
+    msg2 = do_frame(38,  msg2_payload)
+    header = commsdsl_create_ethernet_ip_tcp_headers(len(msg2), seq)
+    commsdsl_write_packet(f, header + msg2, time.time())
+
+def main():
+    with open(sys.argv[1], 'wb') as f:
+        commsdsl_write_pcap_header(f)
+        pcap1(f)
+        pcap2(f)
+
+if __name__ == '__main__':
+    main()
diff --git a/app/commsdsl2wireshark/test/test43/test43.py b/app/commsdsl2wireshark/test/test43/test43.py
@@ -0,0 +1,30 @@
+import sys
+
+from commsdsl_pcap_gen import *
+
+def do_frame(size, id, payload):
+    prefix = struct.pack('>HB', size, id)
+    return prefix + payload
+
+def pcap1(f):
+    seq = 1000
+    msg1_payload = struct.pack('>BBfBB3s', 2, 2, 1.23, 5, 3, b"bla")
+    msg1 = do_frame(1 + len(msg1_payload), 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('>BH', 0, 1)
+    msg2 = do_frame(1 + len(msg2_payload), 2, msg2_payload)
+    header = commsdsl_create_ethernet_ip_tcp_headers(len(msg2), seq)
+    commsdsl_write_packet(f, header + msg2, time.time())
+
+def main():
+    with open(sys.argv[1], 'wb') as f:
+        commsdsl_write_pcap_header(f)
+        pcap1(f)
+        pcap2(f)
+
+if __name__ == '__main__':
+    main()
diff --git a/app/commsdsl2wireshark/test/test44/test44.py b/app/commsdsl2wireshark/test/test44/test44.py
@@ -0,0 +1,22 @@
+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('>BB', 99, 1)
+    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 main():
+    with open(sys.argv[1], 'wb') as f:
+        commsdsl_write_pcap_header(f)
+        pcap1(f)
+
+if __name__ == '__main__':
+    main()
diff --git a/app/commsdsl2wireshark/test/test45/test45.py b/app/commsdsl2wireshark/test/test45/test45.py
@@ -0,0 +1,22 @@
+import sys
+
+from commsdsl_pcap_gen import *
+
+def do_frame(sync, size, payload):
+    prefix = struct.pack('>HH', sync, size)
+    return prefix + payload
+
+def pcap1(f):
+    seq = 1000
+    msg1_payload = struct.pack('>BBBH', 0, 1, 1, 2)
+    msg1 = do_frame(0xabcd, len(msg1_payload), msg1_payload)
+    header = commsdsl_create_ethernet_ip_tcp_headers(len(msg1), seq)
+    commsdsl_write_packet(f, header + msg1, time.time())
+
+def main():
+    with open(sys.argv[1], 'wb') as f:
+        commsdsl_write_pcap_header(f)
+        pcap1(f)
+
+if __name__ == '__main__':
+    main()

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-from functools import reduce`
`2`		`-import operator`
`3`	`1`	`import sys`
`4`	`2`
`5`	`3`	`from commsdsl_pcap_gen import *`