Add SparkplugB dissector

Add a dissector for SparkplugB as a heuristic subdissector of MQTT
and which calls protobuf to dissect the messages payload.

6 files changed, 25 insertions, 0 deletions

diff --git a/packaging/nsis/uninstall.nsi b/packaging/nsis/uninstall.nsi
index c8493ae91b..3d115aa53f 100644
--- a/packaging/nsis/uninstall.nsi
+++ b/packaging/nsis/uninstall.nsi
@@ -215,6 +215,7 @@ Delete "$INSTDIR\snmp\*.*"
 Delete "$INSTDIR\snmp\mibs\*.*"
 Delete "$INSTDIR\styles\translations\*.*"
 Delete "$INSTDIR\styles\*.*"
+Delete "$INSTDIR\protobuf\*.*"
 Delete "$INSTDIR\tpncp\*.*"
 Delete "$INSTDIR\translations\*.*"
 Delete "$INSTDIR\ui\*.*"
@@ -295,6 +296,7 @@ RMDir "$INSTDIR\snmp\mibs"
 RMDir "$INSTDIR\snmp"
 RMDir "$INSTDIR\radius"
 RMDir "$INSTDIR\dtds"
+RMDir "$INSTDIR\protobuf"
 RMDir "$INSTDIR\tpncp"
 RMDir "$INSTDIR\translations"
 RMDir "$INSTDIR\ui"
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index 7af2a5c6e5..b00bf59c82 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -857,6 +857,12 @@ SetOutPath $INSTDIR
 ; Create the extcap directory
 CreateDirectory $INSTDIR\extcap
 
+;
+; install the protobuf .proto definitions in the protobuf subdirectory
+;
+SetOutPath $INSTDIR\protobuf
+File "${STAGING_DIR}\protobuf\sparkplug_b.proto"
+
 ; Install the TPNCP DAT file in the "tpncp" subdirectory
 ; of the installation directory.
 SetOutPath $INSTDIR\tpncp
diff --git a/packaging/wix/ComponentGroups.wxi b/packaging/wix/ComponentGroups.wxi
index 59c6a1c84a..0dd35eff3e 100644
--- a/packaging/wix/ComponentGroups.wxi
+++ b/packaging/wix/ComponentGroups.wxi
@@ -221,6 +221,20 @@
       </ComponentGroup>
     </Fragment>
 
+  <!-- protobuf TLV definitions -->
+    <Fragment>
+      <DirectoryRef Id="dirProtobuf">
+        <Component Id="cmpProtobuf_sparkplug_b_proto" Guid="*">
+          <File Id="filProtobuf_sparkplug_b_proto" KeyPath="yes" Source="$(var.Protobuf.Dir)\sparkplug_b.proto" />
+        </Component>
+      </DirectoryRef>
+    </Fragment>
+    <Fragment>
+      <ComponentGroup Id="CG.Protobuf">
+        <ComponentRef Id="cmpProtobuf_sparkplug_b_proto" />
+      </ComponentGroup>
+    </Fragment>
+
   <!-- TShark -->
     <Fragment>
         <DirectoryRef Id="INSTALLFOLDER">
diff --git a/packaging/wix/DirectoryStructure.wxi b/packaging/wix/DirectoryStructure.wxi
index fe70b66393..fe1b9f6d68 100644
--- a/packaging/wix/DirectoryStructure.wxi
+++ b/packaging/wix/DirectoryStructure.wxi
@@ -30,6 +30,7 @@
           <Directory Id="dirTpncp" Name="tpncp"/>
           <Directory Id="dirTranslations" Name="translations"/>
           <Directory Id="dirWimaxasncp" Name="wimaxasncp"/>
+          <Directory Id="dirProtobuf" Name="protobuf"/>
         </Directory>
       </Directory>
 
diff --git a/packaging/wix/Features.wxi b/packaging/wix/Features.wxi
index 58837cba21..35aefc60de 100644
--- a/packaging/wix/Features.wxi
+++ b/packaging/wix/Features.wxi
@@ -20,6 +20,7 @@
       <ComponentGroupRef Id="CG.Dtds" />
       <ComponentGroupRef Id="CG.Tpncp" />
       <ComponentGroupRef Id="CG.Wimaxasncp" />
+      <ComponentGroupRef Id="CG.Protobuf" />
       <ComponentGroupRef Id="CG.RequiredDependencies" />
 
     </Feature>
diff --git a/packaging/wix/InputPaths.wxi b/packaging/wix/InputPaths.wxi
index 0fae77b721..5ff623559a 100644
--- a/packaging/wix/InputPaths.wxi
+++ b/packaging/wix/InputPaths.wxi
@@ -15,6 +15,7 @@
   <?define Dtds.Dir ="$(var.Staging.Dir)\dtds" ?>
   <?define Tpncp.Dir ="$(var.Staging.Dir)\tpncp" ?>
   <?define Wimaxasncp.Dir ="$(var.Staging.Dir)\wimaxasncp" ?>
+  <?define Protobuf.Dir ="$(var.Staging.Dir)\protobuf" ?>
   <?define Help.Dir ="$(var.Staging.Dir)\help" ?>
   <?define Epan.Lua.Dir ="..\..\epan\wslua" ?>