Field creation functionality for <bundle> in commsdsl2wireshark.

Author: arobenko

app/commsdsl2wireshark/src/WiresharkBitfieldField.cpp

@@ -116,7 +116,6 @@ bool WiresharkBitfieldField::genPrepareImpl()
     }
 
     m_wiresharkFields = wiresharkTransformFieldsList(genMembers());
-    // TODO: force mask
     return true;
 }
 

app/commsdsl2wireshark/src/WiresharkBitfieldField.h

@@ -40,6 +40,7 @@ class WiresharkBitfieldField final : public commsdsl::gen::GenBitfieldField, pub
 
 protected:
     virtual bool genPrepareImpl() override;
+
     virtual std::string wiresharkFieldRegistrationImpl(const std::string& objName, const std::string& refName) const override;
     virtual std::string wiresharkMembersDissectCodeImpl() const override;
 

app/commsdsl2wireshark/src/WiresharkBundleField.cpp

@@ -15,8 +15,15 @@
 
 #include "WiresharkBundleField.h"
 
+#include "Wireshark.h"
 #include "WiresharkGenerator.h"
 
+#include "commsdsl/gen/util.h"
+#include "commsdsl/gen/strings.h"
+
+namespace strings = commsdsl::gen::strings;
+namespace util = commsdsl::gen::util;
+
 namespace commsdsl2wireshark
 {
 
@@ -26,4 +33,56 @@ WiresharkBundleField::WiresharkBundleField(WiresharkGenerator& generator, ParseF
 {
 }
 
+bool WiresharkBundleField::genPrepareImpl()
+{
+    if (!GenBase::genPrepareImpl()) {
+        return false;
+    }
+
+    m_wiresharkFields = wiresharkTransformFieldsList(genMembers());
+    return true;
+}
+
+std::string WiresharkBundleField::wiresharkFieldRegistrationImpl(const std::string& objName, const std::string& refName) const
+{
+    static const std::string Templ =
+        "local #^#OBJ_NAME#$# = #^#CREATE_FUNC#$#(ProtoField.bytes(\"#^#REF_NAME#$#\", \"#^#DISP_NAME#$#\", base.SPACE, #^#DESC#$#))\n"
+    ;
+
+    auto mask = wiresharkForcedIntegralFieldMask();
+    auto obj = genParseObj();
+    util::GenReplacementMap repl = {
+        {"OBJ_NAME", objName},
+        {"CREATE_FUNC", Wireshark::wiresharkCreateFieldFuncName(WiresharkGenerator::wiresharkCast(genGenerator()))},
+        {"REF_NAME", refName},
+        {"DISP_NAME", util::genDisplayName(obj.parseDisplayName(), obj.parseName())},
+        {"DESC", wiresharkFieldDescriptionStr()},
+    };
+
+    if (repl["OBJ_NAME"].empty()) {
+        repl["OBJ_NAME"] = wiresharkFieldObjName();
+    }
+
+    if (repl["REF_NAME"].empty()) {
+        repl["REF_NAME"] = wiresharkFieldRefName();
+    }
+
+    return util::genProcessTemplate(Templ, repl);
+}
+
+std::string WiresharkBundleField::wiresharkMembersDissectCodeImpl() const
+{
+    util::GenStringsList elems;
+    for (auto* f : m_wiresharkFields) {
+        auto str = f->wiresharkDissectCode();
+        if (str.empty()) {
+            continue;
+        }
+
+        elems.push_back(std::move(str));
+    }
+
+    return util::genStrListToString(elems, "\n", "\n");
+}
+
 } // namespace commsdsl2wireshark

app/commsdsl2wireshark/src/WiresharkBundleField.h

@@ -33,6 +33,15 @@ class WiresharkBundleField final : public commsdsl::gen::GenBundleField, public
     using GenElem = commsdsl::gen::GenElem;
 
     WiresharkBundleField(WiresharkGenerator& generator, ParseField parseObj, GenElem* parent);
+
+protected:
+    virtual bool genPrepareImpl() override;
+
+    virtual std::string wiresharkFieldRegistrationImpl(const std::string& objName, const std::string& refName) const override;
+    virtual std::string wiresharkMembersDissectCodeImpl() const override;
+
+private:
+    WiresharkFieldsList m_wiresharkFields;
 };
 
 } // namespace commsdsl2wireshark