Merge branch 'dev' into bugfix/bgp-headerlen-memory-safety

Author: Dimi1010

.github/workflows/build_and_test.yml

@@ -504,18 +504,47 @@ jobs:
           path: ${{ env.CCACHE_DIR }}
           key: ${{ steps.ccache-restore.outputs.cache-primary-key }}
 
+  define-windows-pcap-backend-matrix:
+    name: Determine Windows Pcap Backend Matrix
+    runs-on: ubuntu-latest
+    outputs:
+        npcap-or-default: ${{ steps.generate-backends.outputs.npcap_or_default}}
+    steps:
+      - name: Initialize NPcap backend variable
+        run: echo "npcap_available=false" >> $GITHUB_ENV
+
+      - name: Enable NPcap backend if OEM credentials are available
+        env: # Secrets can't be accessed directly in 'if' conditionals.
+          npcap_username: ${{ secrets.NPCAP_USERNAME }}
+          npcap_password: ${{ secrets.NPCAP_PASSWORD }}
+        if: ${{ env.npcap_username != '' && env.npcap_password != '' }}
+        run: echo "npcap_available=true" >> $GITHUB_ENV
+
+      - name: NPcap backend is unavailable
+        if: ${{ env.npcap_available != 'true' }}
+        run: echo "NPcap backend will be skipped since OEM credentials are missing. NPCAP_USERNAME and NPCAP_PASSWORD are required."
+
+      - name: Generate pcap backends matrix
+        id: generate-backends
+        run: |
+          if [[ "${{ env.npcap_available }}" == "true" ]]; then
+            echo 'npcap_or_default=npcap' >> "$GITHUB_OUTPUT"
+          else
+            echo 'npcap_or_default=winpcap' >> "$GITHUB_OUTPUT"
+          fi
+
   mingw-w64:
-    runs-on: windows-latest
+    needs: define-windows-pcap-backend-matrix
     strategy:
       matrix:
         include:
-          - env: i686
-            sys: mingw32
+          - sys: mingw32
+            env: i686
             pcap_lib: "winpcap"
-          - env: x86_64
-            sys: mingw64
-            pcap_lib: "winpcap"
-
+          - sys: mingw64
+            env: x86_64
+            pcap_lib: ${{ needs.define-windows-pcap-backend-matrix.outputs.npcap-or-default }}
+    runs-on: windows-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -596,6 +625,7 @@ jobs:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
   visual-studio:
+    needs: define-windows-pcap-backend-matrix
     strategy:
       matrix:
         include:
@@ -606,11 +636,11 @@ jobs:
           - os: windows-2025
             platform: "Visual Studio 17 2022"
             arch: "x64"
-            pcap_lib: "winpcap"
+            pcap_lib: ${{ needs.define-windows-pcap-backend-matrix.outputs.npcap-or-default }}
           - os: windows-2022
             platform: "Visual Studio 17 2022"
             arch: "x64"
-            pcap_lib: "winpcap"
+            pcap_lib: ${{ needs.define-windows-pcap-backend-matrix.outputs.npcap-or-default }}
 
     runs-on: ${{ matrix.os }}
     steps:

Common++/src/IpUtils.cpp

@@ -443,11 +443,11 @@ int inet_pton(int af, const char* src, void* dst)
 	{
 #	ifdef AF_INET
 	case AF_INET:
-		return (inet_pton4(src, (uint8_t*)dst));
+		return (inet_pton4(src, static_cast<uint8_t*>(dst)));
 #	endif
 #	ifdef AF_INET6
 	case AF_INET6:
-		return (inet_pton6(src, (uint8_t*)dst));
+		return (inet_pton6(src, static_cast<uint8_t*>(dst)));
 #	endif
 	default:
 		return (-1);

Examples/DnsSpoofing/main.cpp

@@ -264,7 +264,7 @@ bool stringCountComparer(const std::pair<std::string, int>& first, const std::pa
 void onApplicationInterrupted(void* cookie)
 {
 	DnsSpoofingArgs* args = (DnsSpoofingArgs*)cookie;
-	if (args->stats.spoofedHosts.size() == 0)
+	if (args->stats.spoofedHosts.empty())
 	{
 		std::cout << std::endl << "Application closing. No hosts were spoofed." << std::endl;
 	}

Examples/DpdkExample-FilterTraffic/Common.h

@@ -31,7 +31,7 @@
 		exit(1);                                                                                                       \
 	} while (0)
 
-typedef std::unordered_map<pcpp::DpdkDevice*, std::vector<int>> InputDataConfig;
+using InputDataConfig = std::unordered_map<pcpp::DpdkDevice*, std::vector<int>>;
 
 /**
  * Contains all the configuration needed for the worker thread including:

Examples/DpdkExample-FilterTraffic/main.cpp

@@ -221,7 +221,7 @@ void prepareCoreConfiguration(std::vector<pcpp::DpdkDevice*>& dpdkDevicesToUse,
 			}
 			std::cout << std::endl;
 		}
-		if (workerConfigArr[i].inDataCfg.size() == 0)
+		if (workerConfigArr[i].inDataCfg.empty())
 		{
 			std::cout << "      None" << std::endl;
 		}

Examples/TLSFingerprinting/main.cpp

@@ -297,7 +297,7 @@ void printStats(const TLSFingerprintingStats& stats, bool chFP, bool shFP)
 	// write a table of the 10 most common TLS fingerprints
 
 	// if user requested to extract ClientHello TLS fingerprints and there is data to show
-	if (chFP && stats.chFingerprints.size() > 0)
+	if (chFP && !stats.chFingerprints.empty())
 	{
 		if (stats.chFingerprints.size() > 10)
 			std::cout << "Top 10 ";
@@ -309,7 +309,7 @@ void printStats(const TLSFingerprintingStats& stats, bool chFP, bool shFP)
 	}
 
 	// if user requested to extract ServerHello TLS fingerprints and there is data to show
-	if (shFP && stats.shFingerprints.size() > 0)
+	if (shFP && !stats.shFingerprints.empty())
 	{
 		if (stats.shFingerprints.size() > 10)
 			std::cout << "Top 10 ";

Examples/TcpReassembly/main.cpp

@@ -276,8 +276,8 @@ struct TcpReassemblyData
 	}
 };
 
-// typedef representing the connection manager
-typedef std::unordered_map<uint32_t, TcpReassemblyData> TcpReassemblyConnMgr;
+// using declaration representing the connection manager
+using TcpReassemblyConnMgr = std::unordered_map<uint32_t, TcpReassemblyData>;
 
 /**
  * Print application usage

Packet++/header/IPReassembly.h

@@ -284,7 +284,7 @@ namespace pcpp
 		/// @param[in] key A pointer to the identifier of the packet that is being dropped
 		/// @param[in] userCookie A pointer to the cookie provided by the user in IPReassemby c'tor (or nullptr if no
 		/// cookie provided)
-		typedef void (*OnFragmentsClean)(const PacketKey* key, void* userCookie);
+		using OnFragmentsClean = void (*)(const PacketKey* key, void* userCookie);
 
 		/// An enum representing the status returned from processing a fragment
 		enum ReassemblyStatus

Packet++/header/ProtocolType.h

@@ -32,11 +32,11 @@ namespace pcpp
 
 	/// @typedef ProtocolType
 	/// Representing all protocols supported by PcapPlusPlus
-	typedef uint8_t ProtocolType;
+	using ProtocolType = uint8_t;
 
 	/// @typedef ProtocolTypeFamily
 	/// Representing a family of protocols
-	typedef uint32_t ProtocolTypeFamily;
+	using ProtocolTypeFamily = uint32_t;
 
 	/// Unknown protocol (or unsupported by PcapPlusPlus)
 	const ProtocolType UnknownProtocol = 0;

Packet++/header/SomeIpSdLayer.h

@@ -508,10 +508,10 @@ namespace pcpp
 	public:
 		friend class SomeIpSdEntry;
 
-		typedef SomeIpSdEntry* EntryPtr;
-		typedef std::vector<EntryPtr> EntriesVec;
-		typedef SomeIpSdOption* OptionPtr;
-		typedef std::vector<OptionPtr> OptionsVec;
+		using EntryPtr = SomeIpSdEntry*;
+		using EntriesVec = std::vector<EntryPtr>;
+		using OptionPtr = SomeIpSdOption*;
+		using OptionsVec = std::vector<OptionPtr>;
 
 		/// A constructor that creates the layer from an existing packet raw data
 		/// @param[in] data A pointer to the raw data