More unittests for commsdsl2wireshark.

Author: arobenko

app/commsdsl2comms/test/test24/Schema.xml

@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<schema name="test24"
-        id="1"
-        endian="big"
-        version="5">
+<schema name="test24" endian="big" version="5">
     <fields>
         <enum name="MsgId" type="uint8" semanticType="messageId" >
             <validValue name="M1" val="1" />

app/commsdsl2comms/test/test29/Schema.xml

@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<schema name="test29"
-        id="1"
-        endian="big"
-        version="5">
+<schema name="test29" endian="big" version="5">
 
     <fields>
         <enum name="MsgId" type="uint8" semanticType="messageId" >

app/commsdsl2wireshark/src/WiresharkStringField.cpp

@@ -75,7 +75,8 @@ std::string WiresharkStringField::wiresharkFieldRegistrationImpl(const Wireshark
         {"DESC", wiresharkFieldDescriptionStr(refField)},
     };
 
-    if (genStringFieldParseObj().parseHasZeroTermSuffix()) {
+    auto parseObj = genStringFieldParseObj();
+    if (parseObj.parseHasZeroTermSuffix() || parseObj.parseFixedLength()) {
         repl["Z"] = "z";
     }
 
@@ -196,7 +197,52 @@ std::string WiresharkStringField::wiresharkValidFuncBodyImpl([[maybe_unused]] co
 
 std::string WiresharkStringField::wiresharkCompPrepValueStrImpl(const std::string& value) const
 {
-    return '\"' + value + '\"';
+    std::string valueTmp = value;
+    do {
+        if (value.empty()) {
+            break;
+        }
+
+        static const char Prefix = strings::genStringRefPrefix();
+        if (value[0] == Prefix) {
+            auto* refField = genGenerator().genFindField(std::string(value, 1));
+            if (refField == nullptr) {
+                genGenerator().genLogger().genWarning("Failed to find referenced field: " + value);
+                break;
+            }
+
+            if (refField->genParseObj().parseKind() != commsdsl::parse::ParseField::ParseKind::String) {
+                genGenerator().genLogger().genWarning("Not referencing <string> field: " + value);
+                break;
+            }
+
+            auto* refStringField = static_cast<const WiresharkStringField*>(refField);
+            valueTmp = refStringField->genStringFieldParseObj().parseDefaultValue();
+            break;
+        }
+
+        auto prefixPos = value.find_first_of(Prefix);
+        if (prefixPos == std::string::npos) {
+            break;
+        }
+
+        assert(0U < prefixPos);
+        bool allBackSlashes =
+            std::all_of(
+                value.begin(), value.begin() + static_cast<std::ptrdiff_t>(prefixPos),
+                [](char ch)
+                {
+                    return ch == '\\';
+                });
+
+        if (!allBackSlashes) {
+            break;
+        }
+
+        valueTmp.assign(value, 1, std::string::npos);
+    } while (false);
+
+    return '\"' + valueTmp + '\"';
 }
 
 bool WiresharkStringField::wiresharkHasTrivialValidImpl() const

app/commsdsl2wireshark/test/test22/test22.py

@@ -0,0 +1,44 @@
+import sys
+
+from commsdsl_pcap_gen import *
+
+def do_frame(id, payload):
+    prefix = struct.pack('>B', id)
+    return prefix + payload
+
+def pcap1(f):
+    seq = 1
+    msg1_payload1 = struct.pack('>B', 1)
+    msg1_1 = do_frame(1, msg1_payload1)
+    msg1_payload2 = struct.pack('>BH', 0, 5)
+    msg1_2 = do_frame(1, msg1_payload2)
+    header = commsdsl_create_ethernet_ip_tcp_headers(len(msg1_1) + len(msg1_2), seq)
+    commsdsl_write_packet(f, header + msg1_1 + msg1_2, time.time())
+
+def pcap2(f):
+    seq = 2000
+    msg2_payload1 = struct.pack('>B', 1)
+    msg2_1 = do_frame(2, msg2_payload1)
+    msg2_payload2 = struct.pack('>BH', 5, 5)
+    msg2_2 = do_frame(2, msg2_payload2)
+    header = commsdsl_create_ethernet_ip_tcp_headers(len(msg2_1) + len(msg2_2), seq)
+    commsdsl_write_packet(f, header + msg2_1 + msg2_2, time.time())
+
+def pcap3(f):
+    seq = 3000
+    msg3_payload1 = struct.pack('>8s', b"bla\x00\x00\x00\x00\x00")
+    msg3_1 = do_frame(3, msg3_payload1)
+    msg3_payload2 = struct.pack('>8sH', b"hello\x00\x00\x00", 5)
+    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()