Updated DpdkDeviceList to use internal::DeviceListBase. (#1796)

* Changed PointerVector API to return `T*` even when the vector itself is `const` as modifications to the pointee object would not modify the vector itself.

* Updated DpdkDeviceList to use DeviceListBase.

Author: Dimi1010

Common++/header/PointerVector.h

@@ -218,25 +218,13 @@ namespace pcpp
 		}
 
 		/// @return A pointer of the first element in the vector
-		T* front()
-		{
-			return m_Vector.front();
-		}
-
-		/// @return A pointer to the first element in the vector
-		T const* front() const
+		T* front() const
 		{
 			return m_Vector.front();
 		}
 
 		/// @return A pointer to the last element in the vector
-		T* back()
-		{
-			return m_Vector.back();
-		}
-
-		/// @return A pointer to the last element in the vector.
-		T const* back() const
+		T* back() const
 		{
 			return m_Vector.back();
 		}
@@ -297,15 +285,7 @@ namespace pcpp
 		/// Return a pointer to the element in a certain index
 		/// @param[in] index The index to retrieve the element from
 		/// @return The element at the specified position in the vector
-		T* at(int index)
-		{
-			return m_Vector.at(index);
-		}
-
-		/// Return a const pointer to the element in a certain index
-		/// @param[in] index The index to retrieve the element from
-		/// @return The element at the specified position in the vector
-		const T* at(int index) const
+		T* at(int index) const
 		{
 			return m_Vector.at(index);
 		}

Pcap++/header/DpdkDeviceList.h

@@ -4,6 +4,7 @@
 
 #include "SystemUtils.h"
 #include "DpdkDevice.h"
+#include "DeviceListBase.h"
 #include "Logger.h"
 #include <vector>
 
@@ -54,17 +55,19 @@ namespace pcpp
 	///      once in every application at its startup process
 	///    - it contains the list of DpdkDevice instances and enables access to them
 	///    - it has methods to start and stop worker threads. See more details in startDpdkWorkerThreads()
-	class DpdkDeviceList
+	class DpdkDeviceList : internal::DeviceListBase<DpdkDevice>
 	{
 		friend class KniDeviceList;
 
 	private:
+		using Base = internal::DeviceListBase<DpdkDevice>;
+
 		bool m_IsInitialized;
 		static bool m_IsDpdkInitialized;
 		static uint32_t m_MBufPoolSizePerDevice;
 		static uint16_t m_MBufDataSize;
 		static CoreMask m_CoreMask;
-		std::vector<DpdkDevice*> m_DpdkDeviceList;
+		std::vector<DpdkDevice*> m_DpdkDeviceListView;
 		std::vector<DpdkWorkerThread*> m_WorkerThreads;
 
 		DpdkDeviceList();
@@ -139,7 +142,7 @@ namespace pcpp
 		/// @return A vector of all DpdkDevice instances
 		const std::vector<DpdkDevice*>& getDpdkDeviceList() const
 		{
-			return m_DpdkDeviceList;
+			return m_DpdkDeviceListView;
 		}
 
 		/// @return DPDK master core which is the core that initializes the application

Pcap++/src/DpdkDeviceList.cpp

@@ -37,6 +37,7 @@
 #include <sstream>
 #include <iomanip>
 #include <string>
+#include <memory>
 #include <algorithm>
 #include <unistd.h>
 
@@ -63,12 +64,7 @@ namespace pcpp
 
 	DpdkDeviceList::~DpdkDeviceList()
 	{
-		for (auto dev : m_DpdkDeviceList)
-		{
-			delete dev;
-		}
-
-		m_DpdkDeviceList.clear();
+		m_DpdkDeviceListView.clear();
 	}
 
 	bool DpdkDeviceList::initDpdk(CoreMask coreMask, uint32_t mBufPoolSizePerDevice, uint16_t mBufDataSize,
@@ -194,13 +190,17 @@ namespace pcpp
 		// Initialize a DpdkDevice per port
 		for (int i = 0; i < numOfPorts; i++)
 		{
-			DpdkDevice* newDevice = new DpdkDevice(i, mBufPoolSizePerDevice, mBufDataSize);
+			auto newDevice = std::unique_ptr<DpdkDevice>(new DpdkDevice(i, mBufPoolSizePerDevice, mBufDataSize));
 			PCPP_LOG_DEBUG("DpdkDevice #" << i << ": Name='" << newDevice->getDeviceName() << "', PCI-slot='"
 			                              << newDevice->getPciAddress() << "', PMD='" << newDevice->getPMDName()
 			                              << "', MAC Addr='" << newDevice->getMacAddress() << "'");
-			m_DpdkDeviceList.push_back(newDevice);
+			m_DeviceList.pushBack(std::move(newDevice));
 		}
 
+		// Copy the devices into the view vector.
+		m_DpdkDeviceListView.resize(m_DeviceList.size());
+		std::copy(m_DeviceList.begin(), m_DeviceList.end(), m_DpdkDeviceListView.begin());
+
 		m_IsInitialized = true;
 		return true;
 	}
@@ -213,12 +213,12 @@ namespace pcpp
 			return nullptr;
 		}
 
-		if ((uint32_t)portId >= m_DpdkDeviceList.size())
+		if ((uint32_t)portId >= m_DeviceList.size())
 		{
 			return nullptr;
 		}
 
-		return m_DpdkDeviceList.at(portId);
+		return m_DeviceList.at(portId);
 	}
 
 	DpdkDevice* DpdkDeviceList::getDeviceByPciAddress(const std::string& pciAddr) const
@@ -229,10 +229,10 @@ namespace pcpp
 			return nullptr;
 		}
 
-		auto devIter = std::find_if(m_DpdkDeviceList.begin(), m_DpdkDeviceList.end(),
+		auto devIter = std::find_if(m_DeviceList.begin(), m_DeviceList.end(),
 		                            [&pciAddr](const DpdkDevice* dev) { return dev->getPciAddress() == pciAddr; });
 
-		if (devIter == m_DpdkDeviceList.end())
+		if (devIter == m_DeviceList.end())
 		{
 			PCPP_LOG_DEBUG("Found no DPDK devices with PCI address '" << pciAddr << "'");
 			return nullptr;