Updated RemoteDeviceList and PfRingDeviceList's getDevice API to match the rest. (#1810)

* Updated PcapRemoteDeviceList to `getDeviceBy` API.

* Updated PfRingDeviceList to `getDevice` api

* Lint

Author: Dimi1010

Pcap++/header/PcapRemoteDeviceList.h

@@ -140,21 +140,45 @@ namespace pcpp
 		/// Search a PcapRemoteDevice in the list by its IPv4 address
 		/// @param[in] ip4Addr The IPv4 address
 		/// @return The PcapRemoteDevice if found, nullptr otherwise
+		PCPP_DEPRECATED("Use `getDeviceByIp`")
 		PcapRemoteDevice* getRemoteDeviceByIP(const IPv4Address& ip4Addr) const;
 
+		/// Search a PcapRemoteDevice in the list by its IPv4 address
+		/// @param[in] ip4Addr The IPv4 address
+		/// @return The PcapRemoteDevice if found, nullptr otherwise
+		PcapRemoteDevice* getDeviceByIP(const IPv4Address& ip4Addr) const;
+
 		/// Search a PcapRemoteDevice in the list by its IPv6 address
 		/// @param[in] ip6Addr The IPv6 address
 		/// @return The PcapRemoteDevice if found, nullptr otherwise
+		PCPP_DEPRECATED("Use `getDeviceByIp`")
 		PcapRemoteDevice* getRemoteDeviceByIP(const IPv6Address& ip6Addr) const;
 
+		/// Search a PcapRemoteDevice in the list by its IPv6 address
+		/// @param[in] ip6Addr The IPv6 address
+		/// @return The PcapRemoteDevice if found, nullptr otherwise
+		PcapRemoteDevice* getDeviceByIP(const IPv6Address& ip6Addr) const;
+
 		/// Search a PcapRemoteDevice in the list by its IP address (IPv4 or IPv6)
 		/// @param[in] ipAddr The IP address
 		/// @return The PcapRemoteDevice if found, nullptr otherwise
+		PCPP_DEPRECATED("Use `getDeviceByIp`")
 		PcapRemoteDevice* getRemoteDeviceByIP(const IPAddress& ipAddr) const;
 
+		/// Search a PcapRemoteDevice in the list by its IP address (IPv4 or IPv6)
+		/// @param[in] ipAddr The IP address
+		/// @return The PcapRemoteDevice if found, nullptr otherwise
+		PcapRemoteDevice* getDeviceByIP(const IPAddress& ipAddr) const;
+
 		/// Search a PcapRemoteDevice in the list by its IP address
 		/// @param[in] ipAddrAsString The IP address in string format
 		/// @return The PcapRemoteDevice if found, nullptr otherwise
+		PCPP_DEPRECATED("Use `getDeviceByIp`")
 		PcapRemoteDevice* getRemoteDeviceByIP(const std::string& ipAddrAsString) const;
+
+		/// Search a PcapRemoteDevice in the list by its IP address
+		/// @param[in] ipAddrAsString The IP address in string format
+		/// @return The PcapRemoteDevice if found, nullptr otherwise
+		PcapRemoteDevice* getDeviceByIP(const std::string& ipAddrAsString) const;
 	};
 }  // namespace pcpp

Pcap++/header/PfRingDeviceList.h

@@ -48,8 +48,14 @@ namespace pcpp
 		/// Get a PF_RING device by name. The name is the Linux interface name which appears in ifconfig
 		/// (e.g eth0, eth1, etc.)
 		/// @return A pointer to the PF_RING device
+		PCPP_DEPRECATED("Use `getDeviceByName`")
 		PfRingDevice* getPfRingDeviceByName(const std::string& devName) const;
 
+		/// Get a PF_RING device by name. The name is the Linux interface name which appears in ifconfig
+		/// (e.g eth0, eth1, etc.)
+		/// @return A pointer to the PF_RING device
+		PfRingDevice* getDeviceByName(const std::string& devName) const;
+
 		/// Get installed PF_RING version
 		/// @return A string representing PF_RING version
 		std::string getPfRingVersion() const

Pcap++/src/PcapRemoteDeviceList.cpp

@@ -122,6 +122,11 @@ namespace pcpp
 	}
 
 	PcapRemoteDevice* PcapRemoteDeviceList::getRemoteDeviceByIP(const std::string& ipAddrAsString) const
+	{
+		return getDeviceByIP(ipAddrAsString);
+	}
+
+	PcapRemoteDevice* PcapRemoteDeviceList::getDeviceByIP(const std::string& ipAddrAsString) const
 	{
 		IPAddress ipAddr;
 
@@ -135,23 +140,33 @@ namespace pcpp
 			return nullptr;
 		}
 
-		PcapRemoteDevice* result = getRemoteDeviceByIP(ipAddr);
+		PcapRemoteDevice* result = getDeviceByIP(ipAddr);
 		return result;
 	}
 
 	PcapRemoteDevice* PcapRemoteDeviceList::getRemoteDeviceByIP(const IPAddress& ipAddr) const
+	{
+		return getDeviceByIP(ipAddr);
+	}
+
+	PcapRemoteDevice* PcapRemoteDeviceList::getDeviceByIP(const IPAddress& ipAddr) const
 	{
 		if (ipAddr.getType() == IPAddress::IPv4AddressType)
 		{
-			return getRemoteDeviceByIP(ipAddr.getIPv4());
+			return getDeviceByIP(ipAddr.getIPv4());
 		}
 		else  // IPAddress::IPv6AddressType
 		{
-			return getRemoteDeviceByIP(ipAddr.getIPv6());
+			return getDeviceByIP(ipAddr.getIPv6());
 		}
 	}
 
 	PcapRemoteDevice* PcapRemoteDeviceList::getRemoteDeviceByIP(const IPv4Address& ip4Addr) const
+	{
+		return getDeviceByIP(ip4Addr);
+	}
+
+	PcapRemoteDevice* PcapRemoteDeviceList::getDeviceByIP(const IPv4Address& ip4Addr) const
 	{
 		auto it = std::find_if(m_DeviceList.begin(), m_DeviceList.end(), [&ip4Addr](PcapRemoteDevice const* devPtr) {
 			auto devIP = devPtr->getIPv4Address();
@@ -161,6 +176,11 @@ namespace pcpp
 	}
 
 	PcapRemoteDevice* PcapRemoteDeviceList::getRemoteDeviceByIP(const IPv6Address& ip6Addr) const
+	{
+		return getDeviceByIP(ip6Addr);
+	}
+
+	PcapRemoteDevice* PcapRemoteDeviceList::getDeviceByIP(const IPv6Address& ip6Addr) const
 	{
 		auto it = std::find_if(m_DeviceList.begin(), m_DeviceList.end(), [&ip6Addr](PcapRemoteDevice const* devPtr) {
 			auto devIP = devPtr->getIPv6Address();

Pcap++/src/PfRingDeviceList.cpp

@@ -111,6 +111,11 @@ namespace pcpp
 	}
 
 	PfRingDevice* PfRingDeviceList::getPfRingDeviceByName(const std::string& devName) const
+	{
+		return getDeviceByName(devName);
+	}
+
+	PfRingDevice* PfRingDeviceList::getDeviceByName(const std::string& devName) const
 	{
 		PCPP_LOG_DEBUG("Searching all live devices...");
 		auto devIter = std::find_if(m_DeviceList.begin(), m_DeviceList.end(),