Better support for <custom> layer replacing <id> in commsdsl2wireshark.

Author: arobenko

app/commsdsl2wireshark/src/WiresharkCustomLayer.cpp

@@ -16,9 +16,12 @@
 #include "WiresharkCustomLayer.h"
 
 #include "WiresharkGenerator.h"
+#include "WiresharkIdLayer.h"
 
 #include "commsdsl/gen/strings.h"
 
+#include <cassert>
+
 namespace strings = commsdsl::gen::strings;
 
 namespace commsdsl2wireshark
@@ -49,6 +52,22 @@ bool WiresharkCustomLayer::genPrepareImpl()
     return true;
 }
 
+std::string WiresharkCustomLayer::wiresharkExtraDissectCodeImpl() const
+{
+    auto parseObj = genCustomLayerParseObj();
+    if (parseObj.parseSemanticLayerType() != ParseLayer::ParseKind::Id) {
+        return strings::genEmptyString();
+    }
+
+    auto* parentFrame = genParentFrame();
+    assert(parentFrame != nullptr);
+    auto parentNs = parentFrame->genParentNamespace();
+    assert(parentNs != nullptr);
+    auto messages = parentNs->genGetAllMessagesIdSorted();
+    auto mapName = WiresharkGenerator::wiresharkCast(genGenerator()).wiresharkFuncNameFor(*this, "_msg");
+    return WiresharkIdLayer::wiresharkMessagesMapCode(messages, mapName);
+}
+
 bool WiresharkCustomLayer::wiresharkNeedsCrcCalcImpl() const
 {
     auto parseObj = genCustomLayerParseObj();

app/commsdsl2wireshark/src/WiresharkCustomLayer.h

@@ -38,6 +38,7 @@ class WiresharkCustomLayer final : public commsdsl::gen::GenCustomLayer, public
 
 protected:
     virtual bool genPrepareImpl() override;
+    virtual std::string wiresharkExtraDissectCodeImpl() const override;
     virtual bool wiresharkNeedsCrcCalcImpl() const override;
 };
 

app/commsdsl2wireshark/src/WiresharkIdLayer.cpp

@@ -39,39 +39,8 @@ WiresharkIdLayer::WiresharkIdLayer(WiresharkGenerator& generator, ParseLayer par
 {
 }
 
-std::string WiresharkIdLayer::wiresharkDissectBodyImpl() const
-{
-    static const std::string Templ =
-        "#^#FIELD#$#\n"
-        "local id = #^#VALUE_FUNC#$#()\n"
-        "local msg = #^#MAP#$#[id]\n"
-        "#^#OFFSET#$# = #^#NEXT_OFFSET#$#\n"
-        "#^#NEXT#$#\n"
-        ;
-
-    auto* field = wiresharkField();
-    assert(field != nullptr);
-
-    util::GenReplacementMap repl = {
-        {"FIELD", wiresharkDissectFieldCode()},
-        {"NEXT", wiresharkNextFuncCode()},
-        {"MAP", wiresharkMsgMapNameInternal()},
-        {"VALUE_FUNC", field->wiresharkValueFuncName()},
-        {"OFFSET", WiresharkField::wiresharkOffsetStr()},
-        {"NEXT_OFFSET", WiresharkField::wiresharkNextOffsetStr()},
-    };
-
-    return util::genProcessTemplate(Templ, repl);
-}
-
-std::string WiresharkIdLayer::wiresharkExtraDissectCodeImpl() const
+std::string WiresharkIdLayer::wiresharkMessagesMapCode(const GenMessagesAccessList& messages, const std::string& mapName)
 {
-    auto* parentFrame = genParentFrame();
-    assert(parentFrame != nullptr);
-    auto parentNs = parentFrame->genParentNamespace();
-    assert(parentNs != nullptr);
-    auto messages = parentNs->genGetAllMessagesIdSorted();
-
     using DissectMap = std::map<std::uintmax_t /*id */, util::GenStringsList /*dissect_funcs*/>;
 
     DissectMap map;
@@ -106,13 +75,49 @@ std::string WiresharkIdLayer::wiresharkExtraDissectCodeImpl() const
     ;
 
     util::GenReplacementMap repl = {
-        {"NAME", wiresharkMsgMapNameInternal()},
+        {"NAME", mapName},
         {"ELEMS", util::genStrListToString(elems, ",\n", "")},
     };
 
     return util::genProcessTemplate(Templ, repl);
 }
 
+std::string WiresharkIdLayer::wiresharkDissectBodyImpl() const
+{
+    static const std::string Templ =
+        "#^#FIELD#$#\n"
+        "local id = #^#VALUE_FUNC#$#()\n"
+        "local msg = #^#MAP#$#[id]\n"
+        "#^#OFFSET#$# = #^#NEXT_OFFSET#$#\n"
+        "#^#NEXT#$#\n"
+        ;
+
+    auto* field = wiresharkField();
+    assert(field != nullptr);
+
+    util::GenReplacementMap repl = {
+        {"FIELD", wiresharkDissectFieldCode()},
+        {"NEXT", wiresharkNextFuncCode()},
+        {"MAP", wiresharkMsgMapNameInternal()},
+        {"VALUE_FUNC", field->wiresharkValueFuncName()},
+        {"OFFSET", WiresharkField::wiresharkOffsetStr()},
+        {"NEXT_OFFSET", WiresharkField::wiresharkNextOffsetStr()},
+    };
+
+    return util::genProcessTemplate(Templ, repl);
+}
+
+std::string WiresharkIdLayer::wiresharkExtraDissectCodeImpl() const
+{
+    auto* parentFrame = genParentFrame();
+    assert(parentFrame != nullptr);
+    auto parentNs = parentFrame->genParentNamespace();
+    assert(parentNs != nullptr);
+    auto messages = parentNs->genGetAllMessagesIdSorted();
+
+    return wiresharkMessagesMapCode(messages, wiresharkMsgMapNameInternal());
+}
+
 std::string WiresharkIdLayer::wiresharkMsgMapNameInternal() const
 {
     return WiresharkGenerator::wiresharkCast(genGenerator()).wiresharkFuncNameFor(*this, "_msg");

app/commsdsl2wireshark/src/WiresharkIdLayer.h

@@ -18,6 +18,7 @@
 #include "WiresharkLayer.h"
 
 #include "commsdsl/gen/GenIdLayer.h"
+#include "commsdsl/gen/GenMessage.h"
 
 #include <string>
 
@@ -33,8 +34,11 @@ class WiresharkIdLayer final : public commsdsl::gen::GenIdLayer, public Wireshar
 public:
     using ParseLayer = commsdsl::parse::ParseLayer;
     using GenElem = commsdsl::gen::GenElem;
+    using GenMessage = commsdsl::gen::GenMessage;
+    using GenMessagesAccessList = std::vector<const GenMessage*>;
 
     WiresharkIdLayer(WiresharkGenerator& generator, ParseLayer parseObj, GenElem* parent);
+    static std::string wiresharkMessagesMapCode(const GenMessagesAccessList& messages, const std::string& mapName);
 
 protected:
     virtual std::string wiresharkDissectBodyImpl() const override;