More unittests for commdsl2wireshark.

Author: arobenko

app/commsdsl2wireshark/src/Wireshark.cpp

@@ -51,12 +51,12 @@ const std::string& Wireshark::wiresharkProtocolObjName(const WiresharkGenerator&
 
 std::string Wireshark::wiresharkCreateFieldFuncName(const WiresharkGenerator& generator)
 {
-    return wiresharkLocalNamespaceName(generator) + ".createField";
+    return wiresharkLocalNamespaceName(generator) + ".create_field";
 }
 
 std::string Wireshark::wiresharkCreateExtractorFuncName(const WiresharkGenerator& generator)
 {
-    return wiresharkLocalNamespaceName(generator) + ".createExtractor";
+    return wiresharkLocalNamespaceName(generator) + ".create_extractor";
 }
 
 std::string Wireshark::wiresharkFieldsListName(const WiresharkGenerator& generator)

app/commsdsl2wireshark/src/WiresharkField.cpp

@@ -887,8 +887,7 @@ std::string WiresharkField::wiresharkFieldObjNameImpl(const WiresharkField* refF
         genField = &(refField->wiresharkGenField());
     }
     auto& wiresharkGenerator = WiresharkGenerator::wiresharkCast(genField->genGenerator());
-    auto scope = comms::genScopeFor(*genField, wiresharkGenerator, false);
-    return Wireshark::wiresharkLocalNamespaceName(wiresharkGenerator) + '.' + util::genStrReplace(scope, "::", "_");
+    return wiresharkGenerator.wiresharkFuncNameFor(*genField, strings::genEmptyString());
 }
 
 std::string WiresharkField::wiresharkFieldRegistrationImpl(const WiresharkField* refField) const
@@ -1070,7 +1069,8 @@ std::string WiresharkField::wiresharkFieldRefName(const WiresharkField* refField
     }
 
     auto& wiresharkGenerator = WiresharkGenerator::wiresharkCast(genField->genGenerator());
-    auto scope = comms::genScopeFor(*genField, wiresharkGenerator, false);
+    bool addMainNs = &wiresharkGenerator.genSchemaOf(*genField) != &wiresharkGenerator.genProtocolSchema();
+    auto scope = comms::genScopeFor(*genField, wiresharkGenerator, addMainNs);
     return Wireshark::wiresharkProtocolObjName(wiresharkGenerator) + '.' + util::genStrReplace(scope, "::", ".");
 }
 

app/commsdsl2wireshark/src/WiresharkGenerator.cpp

@@ -198,7 +198,8 @@ std::string WiresharkGenerator::wiresharkScopeToName(const std::string& scope) c
 
 std::string WiresharkGenerator::wiresharkFuncNameFor(const GenElem& elem, const std::string& suffix) const
 {
-    auto scope = comms::genScopeFor(elem, *this, false);
+    bool addMainNs = &genSchemaOf(elem) != &genProtocolSchema();
+    auto scope = comms::genScopeFor(elem, *this, addMainNs);
     auto protName = Wireshark::wiresharkLocalNamespaceName(*this);
     return protName + '.' + wiresharkScopeToName(scope) + suffix;
 }

app/commsdsl2wireshark/src/WiresharkPayloadLayer.cpp

@@ -101,7 +101,7 @@ std::string WiresharkPayloadLayer::wiresharkExtraDissectCodeImpl() const
     };
 
     if (!parseObj.parseDescription().empty()) {
-        repl["DESC"] = parseObj.parseDescription();
+        repl["DESC"] = '\"' + parseObj.parseDescription() + '\"';
     }
 
     return util::genProcessTemplate(Templ, repl);

app/commsdsl2wireshark/src/WiresharkRefField.cpp

@@ -167,7 +167,7 @@ std::string WiresharkRefField::wiresharkFieldObjNameImpl(const WiresharkField* r
 std::string WiresharkRefField::wiresharkFieldRegistrationImpl(const WiresharkField* refField) const
 {
     assert(m_wiresharkField != nullptr);
-    if (m_alias) {
+    if (m_alias && (refField == nullptr)) {
         genGenerator().genLogger().genDebug(genName() + " field is full alias to " + m_wiresharkField->wiresharkGenField().genParseObj().parseExternalRef() + ", not generating registration");
         return strings::genEmptyString();
     }

app/commsdsl2wireshark/test/test49/src/test49.lua-test49_local.field_B1_value.replace

@@ -1 +1,6 @@
--- TODO
+local short_val = test49_local.field_B1Members_Short_value()
+if (short_val ~= 0xff) then
+    return short_val
+end
+
+return test49_local.field_B1Members_LongMembers_ActLong_value()

app/commsdsl2wireshark/test/test49/test49.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('>BH3s', 0xff, 3, b"bla")
+    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
+    msg1_payload = struct.pack('>B3s', 3, b"abc")
+    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)
+        pcap2(f)
+
+if __name__ == '__main__':
+    main()

app/commsdsl2wireshark/test/test50/test50.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('>BB3sB3sBB', 0xaa, 3, b"bla", 3, b"\x01\x02\x03", 0x12, 5)
+    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()