Support of personal lua plugin directory

.github/workflows/build.yml

@@ -39,7 +39,7 @@ jobs:
     - name: Upload Win64 Files
       uses: actions/upload-artifact@v4
       with:
-        name: dsV2Gshark_Files_Win_x64 
+        name: dsV2Gshark_Files_Win_x86_64 
         path: artifact_dir/*
 
   build-linux:

V2G_Libraries/CertificateInfos/main.rc

@@ -1,11 +1,11 @@
 #include <windows.h>
 
-#define VER_FILEVERSION             1,3,0,0
-#define VER_FILEVERSION_STR         "1.3.0.0\0"
+#define VER_FILEVERSION             1,3,1,0
+#define VER_FILEVERSION_STR         "1.3.1.0\0"
 #define VER_COMPANYNAME_STR         "dSPACE GmbH"
 #define VER_PRODUCTNAME_STR         "V2gCertificateInfos"
-#define VER_PRODUCTVERSION          1,3,0,0
-#define VER_PRODUCTVERSION_STR      "1.3.0.0\0"
+#define VER_PRODUCTVERSION          1,3,1,0
+#define VER_PRODUCTVERSION_STR      "1.3.1.0\0"
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION VER_FILEVERSION

V2G_Libraries/V2GDecoder/main.rc

@@ -1,11 +1,11 @@
 #include <windows.h>
 
-#define VER_FILEVERSION             1,3,0,0
-#define VER_FILEVERSION_STR         "1.3.0.0\0"
+#define VER_FILEVERSION             1,3,1,0
+#define VER_FILEVERSION_STR         "1.3.1.0\0"
 #define VER_COMPANYNAME_STR         "dSPACE GmbH"
 #define VER_PRODUCTNAME_STR         "V2gDecoder"
-#define VER_PRODUCTVERSION          1,3,0,0
-#define VER_PRODUCTVERSION_STR      "1.3.0.0\0"
+#define VER_PRODUCTVERSION          1,3,1,0
+#define VER_PRODUCTVERSION_STR      "1.3.1.0\0"
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION VER_FILEVERSION

Wireshark/plugins/v2gmsg.lua

@@ -10,11 +10,34 @@
 --
 -- See license file (dsV2Gshark_LICENSE.txt)
 --
-DS_V2GSHARK_VERSION = "1.3.0" -- DO NOT CHANGE
+
+-- do OS specific stuff, required to properly load v2g libs
+local plugins_path -- path to the plugins directory of this script
+local lib_pattern
+if package.config:sub(1, 1) == "\\" then
+    -- WINDOWS
+    plugins_path = debug.getinfo(1, "S").source:sub(2):match("(.*[/\\])") or "./"
+    lib_pattern = "?.dll"
+else
+    -- UNIX
+    plugins_path = debug.getinfo(1, "S").source:sub(2):match("(.*/)") or "./"
+    lib_pattern = "?.so"
+end
+local wireshark_path = plugins_path .. "../"
+if not string.find(plugins_path, package.path) then
+    -- extend path (where to load .lua files)
+    package.path = package.path .. ";" .. plugins_path .. "?.lua"
+end
+if not string.find(wireshark_path, package.cpath) then
+    -- extend cpath (where to load .so files)
+    package.cpath = package.cpath .. ";" .. wireshark_path .. lib_pattern .. ";" .. plugins_path .. lib_pattern
+end
+
+local v2gshared = require("v2gshared")
 
 p_v2gmsg = Proto("v2gmsg", "V2G Message")
 local p_v2gmsg_info = {
-    version = DS_V2GSHARK_VERSION,
+    version = v2gshared.DS_V2GSHARK_VERSION,
     author = "dSPACE GmbH",
     description = "Dissector for V2G Messages (DIN 70121, ISO15118-2, ISO15118-20)"
 }
@@ -25,27 +48,6 @@ local v2g_decoder = require("v2gLuaDecoder")
 v2g_decoder.initValidator()
 local cert_info_extractor = require("v2gX509CertInfos")
 
--- Settings
-p_v2gmsg.prefs["infotext"] = Pref.statictext("dSPACE V2Gshark Wireshark Plugin")
-p_v2gmsg.prefs["additionalinfo"] = Pref.statictext("powered by chargebyte cbExiGen")
-p_v2gmsg.prefs["additionalinfo2"] = Pref.statictext("")
-p_v2gmsg.prefs["portrange_tlssecret"] =
-    Pref.range(
-    "TLS secret UDP port(s)",
-    "49152-65535",
-    "UDP source ports of TLS secret disclosure packets.\n\nDefault: '49152-65535'",
-    65535
-)
-p_v2gmsg.prefs["portrange_v2g"] =
-    Pref.range(
-    "V2G message TCP port(s)",
-    "49152-65535",
-    "TCP source ports of V2G request and response messages.\n\nDefault: '49152-65535'",
-    65535
-)
-p_v2gmsg.prefs["additionalinfo3"] = Pref.statictext("")
-p_v2gmsg.prefs["versioninfo"] = Pref.statictext("Version " .. DS_V2GSHARK_VERSION)
-
 -- Buffer for all decoded messages. Maps packetID -> xml string (or nil)
 local xml_buffer = {}
 
@@ -128,10 +130,6 @@ function p_v2gmsg.init()
     decoded_with_auto_schema_detection = {}
     decoded_with_schema_namespace = {}
     decoded_error_code = {}
-
-    -- register v2g ports
-    DissectorTable.get("tls.port"):add(p_v2gmsg.prefs["portrange_v2g"], p_v2gtp)
-    DissectorTable.get("tcp.port"):add(p_v2gmsg.prefs["portrange_v2g"], p_v2gtp)
 end
 
 local function decode_v2g_message(schema, exi_string, packet_number)

Wireshark/plugins/v2gsdp.lua

@@ -4,11 +4,12 @@
 --
 -- See license file (dsV2Gshark_LICENSE.txt)
 --
+local v2gshared = require("v2gshared")
 
 p_sdpreq = Proto("v2gsdp-req", "V2G SECC Discovery Protocol Request")
 p_sdpres = Proto("v2gsdp-res", "V2G SECC Discovery Protocol Response")
 local p_v2gsdp_info = {
-    version = DS_V2GSHARK_VERSION,
+    version = v2gshared.DS_V2GSHARK_VERSION,
     author = "dSPACE GmbH"
 }
 set_plugin_info(p_v2gsdp_info)

Wireshark/plugins/v2gshared.lua

@@ -0,0 +1,10 @@
+--
+-- Copyright 2024, dSPACE GmbH. All rights reserved.
+--
+-- See license file (dsV2Gshark_LICENSE.txt)
+--
+local v2gshared = {}
+
+v2gshared.DS_V2GSHARK_VERSION = "1.3.1" -- DO NOT CHANGE
+
+return v2gshared

Wireshark/plugins/v2gtlssecret.lua

@@ -5,14 +5,29 @@
 --
 -- See license file (dsV2Gshark_LICENSE.txt)
 --
+local v2gshared = require("v2gshared")
 
 p_v2gtlssecret = Proto("v2gtlssecret", "V2G TLS secret")
 local p_v2gtlssecret_info = {
-    version = DS_V2GSHARK_VERSION,
+    version = v2gshared.DS_V2GSHARK_VERSION,
     author = "dSPACE GmbH"
 }
 set_plugin_info(p_v2gtlssecret_info)
 
+-- Settings
+p_v2gtlssecret.prefs["infotext"] = Pref.statictext("dSPACE V2Gshark Wireshark Plugin")
+p_v2gtlssecret.prefs["additionalinfo"] = Pref.statictext("powered by chargebyte cbExiGen")
+p_v2gtlssecret.prefs["additionalinfo2"] = Pref.statictext("")
+p_v2gtlssecret.prefs["portrange_tlssecret"] =
+    Pref.range(
+    "TLS secret UDP port(s)",
+    "49152-65535",
+    "UDP source ports of TLS secret disclosure packets.\n\nDefault: '49152-65535'",
+    65535
+)
+p_v2gtlssecret.prefs["additionalinfo3"] = Pref.statictext("")
+p_v2gtlssecret.prefs["versioninfo"] = Pref.statictext("Version " .. v2gshared.DS_V2GSHARK_VERSION)
+
 local min_wireshark_version = "3.5.0"
 
 local f_cr = ProtoField.string("v2gtlssecret.clientrandom", "NSS Key Log", base.ASCII)
@@ -204,6 +219,6 @@ end -- end function 'p_v2gtlssecret.dissector'
 -- initialization routine
 function p_v2gtlssecret.init()
     -- register tls secret ports
-    DissectorTable.get("udp.port"):add(p_v2gmsg.prefs["portrange_tlssecret"], p_v2gtlssecret)
+    DissectorTable.get("udp.port"):add(p_v2gtlssecret.prefs["portrange_tlssecret"], p_v2gtlssecret)
     frame_numbers = {}
 end

Wireshark/plugins/v2gtp.lua

@@ -4,14 +4,29 @@
 --
 -- See license file (dsV2Gshark_LICENSE.txt)
 --
+local v2gshared = require("v2gshared")
 
 p_v2gtp = Proto("v2gtp", "V2G Transfer Protocol")
 local p_v2gtp_info = {
-    version = DS_V2GSHARK_VERSION,
+    version = v2gshared.DS_V2GSHARK_VERSION,
     author = "dSPACE GmbH"
 }
 set_plugin_info(p_v2gtp_info)
 
+-- Settings
+p_v2gtp.prefs["infotext"] = Pref.statictext("dSPACE V2Gshark Wireshark Plugin")
+p_v2gtp.prefs["additionalinfo"] = Pref.statictext("powered by chargebyte cbExiGen")
+p_v2gtp.prefs["additionalinfo2"] = Pref.statictext("")
+p_v2gtp.prefs["portrange_v2g"] =
+    Pref.range(
+    "V2G message TCP port(s)",
+    "49152-65535",
+    "TCP source ports of V2G request and response messages.\n\nDefault: '49152-65535'",
+    65535
+)
+p_v2gtp.prefs["additionalinfo3"] = Pref.statictext("")
+p_v2gtp.prefs["versioninfo"] = Pref.statictext("Version " .. v2gshared.DS_V2GSHARK_VERSION)
+
 local V2GTP_HDR_LENGTH = 8
 
 local f_pv = ProtoField.uint8("v2gtp.protoversion", "Protocol Version", base.HEX)
@@ -158,8 +173,8 @@ end
 
 -- initialization routine
 function p_v2gtp.init()
-    -- register protocol
-    DissectorTable.get("udp.port"):add(15118, p_v2gtp)
-    DissectorTable.get("tcp.port"):add(15118, p_v2gtp)
-    DissectorTable.get("tls.port"):add(15118, p_v2gtp)
+    -- register v2g ports
+    DissectorTable.get("udp.port"):add(p_v2gtp.prefs["portrange_v2g"], p_v2gtp)
+    DissectorTable.get("tls.port"):add(p_v2gtp.prefs["portrange_v2g"], p_v2gtp)
+    DissectorTable.get("tcp.port"):add(p_v2gtp.prefs["portrange_v2g"], p_v2gtp)
 end

update_version.bat

@@ -29,15 +29,15 @@ for /F delims^=^ eol^= %%A in ('%SystemRoot%\System32\findstr.exe /N "^" "%FileN
 ) >>"%TempFile%"
 move /y %TempFile% %FileName%
 
-:: update v2gmsg.lua
-set "FileName=.\Wireshark\plugins\v2gmsg.lua"
+:: update v2gshared.lua
+set "FileName=.\Wireshark\plugins\v2gshared.lua"
 del "%TempFile%" 2>nul
 for /F delims^=^ eol^= %%A in ('%SystemRoot%\System32\findstr.exe /N "^" "%FileName%"') do (
     set "Line=%%A"
     setlocal EnableDelayedExpansion
-    if not "!Line:DS_V2GSHARK_VERSION=!" == "!Line!" (
+    if not "!Line:v2gshared.DS_V2GSHARK_VERSION=!" == "!Line!" (
         if not "!Line:DO NOT CHANGE=!" == "!Line!" (
-            echo DS_V2GSHARK_VERSION = "%newVersion%" -- DO NOT CHANGE
+            echo v2gshared.DS_V2GSHARK_VERSION = "%newVersion%" -- DO NOT CHANGE
         ) else echo(!Line:*:=!
     ) else echo(!Line:*:=!
     endlocal