Consolidate shared DeviceList functionality under a common base class.

Examples/Arping/main.cpp

@@ -86,7 +86,7 @@ void printAppVersion()
  */
 void listInterfaces()
 {
-	const std::vector<pcpp::PcapLiveDevice*>& devList = pcpp::PcapLiveDeviceList::getInstance().getPcapLiveDevicesList();
+	const auto& devList = pcpp::PcapLiveDeviceList::getInstance();
 
 	std::cout << std::endl << "Network interfaces:" << std::endl;
 	for (const auto &dev : devList)

Examples/DNSResolver/main.cpp

@@ -73,10 +73,8 @@ void printAppVersion()
  */
 void listInterfaces()
 {
-	const std::vector<pcpp::PcapLiveDevice*>& devList = pcpp::PcapLiveDeviceList::getInstance().getPcapLiveDevicesList();
-
 	std::cout << std::endl << "Network interfaces:" << std::endl;
-	for (const auto &dev : devList)
+	for (const auto& dev : pcpp::PcapLiveDeviceList::getInstance())
 	{
 		std::cout << "    -> Name: '" << dev->getName() << "'   IP address: " << dev->getIPv4Address().toString() << std::endl;
 	}
@@ -187,7 +185,7 @@ int main(int argc, char* argv[])
 	// if interface name or IP was not provided - find a device that has a default gateway
 	else
 	{
-		const std::vector<pcpp::PcapLiveDevice*>& devList = pcpp::PcapLiveDeviceList::getInstance().getPcapLiveDevicesList();
+		const auto& devList = pcpp::PcapLiveDeviceList::getInstance();
 
 		auto iter = std::find_if(devList.begin(), devList.end(),
 								 [](pcpp::PcapLiveDevice *dev) { return dev->getDefaultGateway() != pcpp::IPv4Address::Zero; });

Examples/DnsSpoofing/main.cpp

@@ -125,7 +125,7 @@ void printAppVersion()
  */
 void listInterfaces()
 {
-	const std::vector<pcpp::PcapLiveDevice*>& devList = pcpp::PcapLiveDeviceList::getInstance().getPcapLiveDevicesList();
+	const auto& devList = pcpp::PcapLiveDeviceList::getInstance();
 
 	std::cout << std::endl << "Network interfaces:" << std::endl;
 	for (const auto &dev : devList)

Examples/IcmpFileTransfer/Common.cpp

@@ -88,7 +88,7 @@ void printAppVersion()
  */
 void listInterfaces()
 {
-	const std::vector<pcpp::PcapLiveDevice*>& devList = pcpp::PcapLiveDeviceList::getInstance().getPcapLiveDevicesList();
+	const auto& devList = pcpp::PcapLiveDeviceList::getInstance();
 
 	std::cout << std::endl << "Network interfaces:" << std::endl;
 	for (const auto &dev : devList)

Examples/SSLAnalyzer/main.cpp

@@ -121,7 +121,7 @@ void printAppVersion()
  */
 void listInterfaces()
 {
-	const std::vector<pcpp::PcapLiveDevice*>& devList = pcpp::PcapLiveDeviceList::getInstance().getPcapLiveDevicesList();
+	const auto& devList = pcpp::PcapLiveDeviceList::getInstance();
 
 	std::cout << std::endl << "Network interfaces:" << std::endl;
 	for (const auto &dev : devList)

Examples/TLSFingerprinting/main.cpp

@@ -125,7 +125,7 @@ void printAppVersion()
  */
 void listInterfaces()
 {
-	const std::vector<pcpp::PcapLiveDevice*>& devList = pcpp::PcapLiveDeviceList::getInstance().getPcapLiveDevicesList();
+	const auto& devList = pcpp::PcapLiveDeviceList::getInstance();
 
 	std::cout << std::endl << "Network interfaces:" << std::endl;
 	for (const auto &dev : devList)

Pcap++/header/PcapLiveDeviceList.h

@@ -2,8 +2,10 @@
 
 #include "IpAddress.h"
 #include "PcapLiveDevice.h"
+#include "PointerVector.h"
 #include <vector>
 #include <memory>
+#include "DeprecationUtils.h"
 
 
 /// @file
@@ -24,7 +26,7 @@ namespace pcpp
 	class PcapLiveDeviceList
 	{
 	private:
-		std::vector<std::unique_ptr<PcapLiveDevice>> m_LiveDeviceList;
+		PointerVector<PcapLiveDevice> m_LiveDeviceList;
 		// Vector of raw device pointers to keep the signature of getPcapLiveDevicesList, as it returns a reference.
 		std::vector<PcapLiveDevice*> m_LiveDeviceListView;
 
@@ -39,6 +41,16 @@ namespace pcpp
 
 		void updateLiveDeviceListView() const;
 	public:
+		/**
+		 * Iterator object that can be used for iterating all PcapLiveDevice in list
+		 */
+		using iterator = PointerVector<PcapLiveDevice>::VectorIterator;
+
+		/**
+		 * Const iterator object that can be used for iterating all PcapLiveDevice in a constant list
+		 */
+		using const_iterator = PointerVector<PcapLiveDevice>::ConstVectorIterator;
+
 		PcapLiveDeviceList(const PcapLiveDeviceList&) = delete;
 		PcapLiveDeviceList(PcapLiveDeviceList&&) noexcept = delete;
 		PcapLiveDeviceList& operator=(const PcapLiveDeviceList&) = delete;
@@ -56,7 +68,9 @@ namespace pcpp
 
 		/**
 		 * @return A vector containing pointers to all live devices currently installed on the machine
+		 * @deprecated This method has been deprecated in favor of begin/end iteration API.
 		 */
+		PCPP_DEPRECATED("Deprecated in favor of begin/end iteration API")
 		const std::vector<PcapLiveDevice*>& getPcapLiveDevicesList() const { return m_LiveDeviceListView; };
 
 		/**
@@ -117,6 +131,38 @@ namespace pcpp
 		 * Reset the live device list and DNS server list, meaning clear and refetch them
 		 */
 		void reset();
+
+		/**
+		 * @return An iterator object pointing to the first PcapRemoteDevice in list
+		 */
+		iterator begin()
+		{
+			return m_LiveDeviceList.begin();
+		}
+
+		/**
+		 * @return A const iterator object pointing to the first PcapRemoteDevice in list
+		 */
+		const_iterator begin() const
+		{
+			return m_LiveDeviceList.begin();
+		}
+
+		/**
+		 * @return An iterator object pointing to the last PcapRemoteDevice in list
+		 */
+		iterator end()
+		{
+			return m_LiveDeviceList.end();
+		}
+
+		/**
+		 * @return A const iterator object pointing to the last PcapRemoteDevice in list
+		 */
+		const_iterator end() const
+		{
+			return m_LiveDeviceList.end();
+		}
 	};
 
 } // namespace pcpp

Pcap++/header/PcapRemoteDeviceList.h

@@ -4,6 +4,7 @@
 
 #include <memory>
 #include "IpAddress.h"
+#include "PointerVector.h"
 #include "PcapRemoteDevice.h"
 
 /// @file
@@ -28,7 +29,7 @@ namespace pcpp
 	class PcapRemoteDeviceList
 	{
 	private:
-		std::vector<PcapRemoteDevice*> m_RemoteDeviceList;
+		PointerVector<PcapRemoteDevice> m_RemoteDeviceList;
 		IPAddress m_RemoteMachineIpAddress;
 		uint16_t m_RemoteMachinePort;
 		std::shared_ptr<PcapRemoteAuthentication> m_RemoteAuthentication;
@@ -44,20 +45,20 @@ namespace pcpp
 		/**
 		 * Iterator object that can be used for iterating all PcapRemoteDevice in list
 		 */
-		typedef typename std::vector<PcapRemoteDevice*>::iterator RemoteDeviceListIterator;
+		using RemoteDeviceListIterator = PointerVector<PcapRemoteDevice>::VectorIterator;
+		using iterator = RemoteDeviceListIterator;
 
 		/**
 		 * Const iterator object that can be used for iterating all PcapRemoteDevice in a constant list
 		 */
-		typedef typename std::vector<PcapRemoteDevice*>::const_iterator ConstRemoteDeviceListIterator;
+		using ConstRemoteDeviceListIterator = PointerVector<PcapRemoteDevice>::ConstVectorIterator;
+		using const_iterator = ConstRemoteDeviceListIterator;
 
 		PcapRemoteDeviceList(const PcapRemoteDeviceList&) = delete;
 		PcapRemoteDeviceList(PcapRemoteDeviceList&&) noexcept = delete;
 		PcapRemoteDeviceList& operator=(const PcapRemoteDeviceList&) = delete;
 		PcapRemoteDeviceList& operator=(PcapRemoteDeviceList&&) noexcept = delete;
 
-		~PcapRemoteDeviceList();
-
 		/**
 		 * A static method for creating a PcapRemoteDeviceList instance for a certain remote machine. This methods creates the instance, and also
 		 * creates a list of PcapRemoteDevice instances stored in it, one for each remote network interface. Notice this method allocates
@@ -128,22 +129,22 @@ namespace pcpp
 		/**
 		 * @return An iterator object pointing to the first PcapRemoteDevice in list
 		 */
-		RemoteDeviceListIterator begin() { return m_RemoteDeviceList.begin(); }
+		iterator begin() { return m_RemoteDeviceList.begin(); }
 
 		/**
 		 * @return A const iterator object pointing to the first PcapRemoteDevice in list
 		 */
-		ConstRemoteDeviceListIterator begin() const { return m_RemoteDeviceList.begin(); }
+		const_iterator begin() const { return m_RemoteDeviceList.begin(); }
 
 		/**
 		 * @return An iterator object pointing to the last PcapRemoteDevice in list
 		 */
-		RemoteDeviceListIterator end() { return m_RemoteDeviceList.end(); }
+		iterator end() { return m_RemoteDeviceList.end(); }
 
 		/**
 		 * @return A const iterator object pointing to the last PcapRemoteDevice in list
 		 */
-		ConstRemoteDeviceListIterator end() const { return m_RemoteDeviceList.end(); }
+		const_iterator end() const { return m_RemoteDeviceList.end(); }
 
 	};
 

Pcap++/src/PcapLiveDeviceList.cpp

@@ -54,13 +54,12 @@ void PcapLiveDeviceList::init()
 #else //__linux__, __APPLE__, __FreeBSD__
 		auto dev = std::unique_ptr<PcapLiveDevice>(new PcapLiveDevice(currInterface, true, true, true));
 #endif
-		m_LiveDeviceList.push_back(std::move(dev));
+		m_LiveDeviceList.pushBack(std::move(dev));
 	}
 
 	m_LiveDeviceListView.resize(m_LiveDeviceList.size());
 	// Full update of all elements of the view vector to synchronize them with the main vector.
-	std::transform(m_LiveDeviceList.begin(), m_LiveDeviceList.end(), m_LiveDeviceListView.begin(),
-				   [](const std::unique_ptr<PcapLiveDevice>& ptr) { return ptr.get(); });
+	std::copy(m_LiveDeviceList.begin(), m_LiveDeviceList.end(), m_LiveDeviceListView.begin());
 
 	setDnsServers();
 }
@@ -291,7 +290,7 @@ PcapLiveDevice* PcapLiveDeviceList::getPcapLiveDeviceByIp(const IPv4Address& ipA
 			if (*currAddr == ipAddr)
 			{
 				PCPP_LOG_DEBUG("Found matched address!");
-				return devicePtr.get();
+				return devicePtr;
 			}
 		}
 	}
@@ -324,7 +323,7 @@ PcapLiveDevice* PcapLiveDeviceList::getPcapLiveDeviceByIp(const IPv6Address& ip6
 			if (*currAddr == ip6Addr)
 			{
 				PCPP_LOG_DEBUG("Found matched address!");
-				return devicePtr.get();
+				return devicePtr;
 			}
 		}
 	}
@@ -354,15 +353,15 @@ PcapLiveDevice* PcapLiveDeviceList::getPcapLiveDeviceByName(const std::string& n
 {
 	PCPP_LOG_DEBUG("Searching all live devices...");
 	auto devIter = std::find_if(m_LiveDeviceList.begin(), m_LiveDeviceList.end(),
-								[&name](const std::unique_ptr<PcapLiveDevice>& dev) { return dev->getName() == name; });
+								[&name](PcapLiveDevice* const dev) { return dev->getName() == name; });
 
 	if (devIter == m_LiveDeviceList.end())
 	{
 		PCPP_LOG_DEBUG("Found no live device with name '" << name << "'");
 		return nullptr;
 	}
 
-	return devIter->get();
+	return *devIter;
 }
 
 PcapLiveDevice* PcapLiveDeviceList::getPcapLiveDeviceByIpOrName(const std::string& ipOrName) const

Pcap++/src/PcapRemoteDeviceList.cpp

@@ -9,6 +9,7 @@
 #include "IpAddressUtils.h"
 #include "pcap.h"
 #include <array>
+#include <memory>
 #include <ws2tcpip.h>
 
 namespace pcpp
@@ -83,9 +84,9 @@ PcapRemoteDeviceList* PcapRemoteDeviceList::getRemoteDeviceList(const IPAddress&
 
 	for (pcap_if_t* currInterface = interfaceList.get(); currInterface != nullptr; currInterface = currInterface->next)
 	{
-		PcapRemoteDevice* pNewRemoteDevice = new PcapRemoteDevice(currInterface, resultList->m_RemoteAuthentication,
-				resultList->getRemoteMachineIpAddress(), resultList->getRemoteMachinePort());
-		resultList->m_RemoteDeviceList.push_back(pNewRemoteDevice);
+		std::unique_ptr<PcapRemoteDevice> pNewRemoteDevice = std::unique_ptr<PcapRemoteDevice>(
+			new PcapRemoteDevice(currInterface, resultList->m_RemoteAuthentication, resultList->getRemoteMachineIpAddress(), resultList->getRemoteMachinePort()));
+		resultList->m_RemoteDeviceList.pushBack(std::move(pNewRemoteDevice));
 	}
 
 	return resultList;
@@ -210,16 +211,6 @@ void PcapRemoteDeviceList::setRemoteAuthentication(const PcapRemoteAuthenticatio
 	}
 }
 
-PcapRemoteDeviceList::~PcapRemoteDeviceList()
-{
-	while (m_RemoteDeviceList.size() > 0)
-	{
-		RemoteDeviceListIterator devIter = m_RemoteDeviceList.begin();
-		delete (*devIter);
-		m_RemoteDeviceList.erase(devIter);
-	}
-}
-
 } // namespace pcpp
 
 #endif // _WIN32