Address review changes (seladb#1656)

Author: vcomito-apexai

Common++/src/SystemUtils.cpp

@@ -200,9 +200,7 @@ namespace pcpp
 
 	bool directoryExists(const std::string& dirPath)
 	{
-		struct stat info
-		{
-		};
+		struct stat info{};
 
 		if (stat(dirPath.c_str(), &info) != 0)
 		{
@@ -370,9 +368,7 @@ namespace pcpp
 #if defined(_WIN32)
 		SetConsoleCtrlHandler((PHANDLER_ROUTINE)handlerRoutine, TRUE);
 #else
-		struct sigaction action
-		{
-		};
+		struct sigaction action{};
 		memset(&action, 0, sizeof(struct sigaction));
 		action.sa_handler = handlerRoutine;
 		sigemptyset(&action.sa_mask);

Packet++/src/DnsResourceData.cpp

@@ -204,8 +204,7 @@ namespace pcpp
 	{
 		if (m_DataLen == 0 || m_Data == nullptr)
 		{
-			PCPP_LOG_ERROR("Input data is null or illegal"
-			               << "|m_DataLen:" << m_DataLen);
+			PCPP_LOG_ERROR("Input data is null or illegal" << "|m_DataLen:" << m_DataLen);
 			return false;
 		}
 

Packet++/src/VrrpLayer.cpp

@@ -479,8 +479,7 @@ namespace pcpp
 		auto* ipLayer = m_Packet->getLayerOfType<pcpp::IPLayer>();
 		if (ipLayer == nullptr)
 		{
-			PCPP_LOG_ERROR("Calculate checksum failed, for can not get IPLayer"
-			               << "");
+			PCPP_LOG_ERROR("Calculate checksum failed, for can not get IPLayer" << "");
 			return 0;
 		}
 

Pcap++/header/PcapLiveDevice.h

@@ -173,27 +173,27 @@ namespace pcpp
 		/// (you can read more here: <https://www.tcpdump.org/manpages/pcap-tstamp.7.html>)
 		enum class TimestampProvider
 		{
-			/** host-provided, unknown characteristics, default */
+			/// host-provided, unknown characteristics, default
 			Host = 0,
-			/** host-provided, low precision, synced with the system clock */
-			HostLowPrec,
-			/** host-provided, high precision, synced with the system clock */
-			HostHighPrec,
-			/** device-provided, synced with the system clock */
+			/// host-provided, low precision, synced with the system clock
+			HostLowPrecision,
+			/// host-provided, high precision, synced with the system clock
+			HostHighPrecision,
+			/// device-provided, synced with the system clock
 			Adapter,
-			/** device-provided, not synced with the system clock */
+			/// device-provided, not synced with the system clock
 			AdapterUnsynced,
-			/** host-provided, high precision, not synced with the system clock */
-			HostHighPrecUnsynced
+			/// host-provided, high precision, not synced with the system clock
+			HostHighPrecisionUnsynced
 		};
 
 		/// Set the precision of timestamps associated to each captured packet
 		/// (you can read more here: <https://www.tcpdump.org/manpages/pcap-tstamp.7.html>)
 		enum class TimestampPrecision
 		{
-			/** use timestamps with microsecond precision, default */
+			/// use timestamps with microsecond precision, default
 			Microseconds = 0,
-			/** use timestamps with nanosecond precision */
+			/// use timestamps with nanosecond precision
 			Nanoseconds,
 		};
 

Pcap++/src/PcapLiveDevice.cpp

@@ -102,27 +102,27 @@ namespace pcpp
 		PCPP_LOG_ERROR("Windows doesn't support timestampPrecision option");
 	}
 #else
-	static int timestampProviderMap(const PcapLiveDevice::TimestampProvider timestampProvider)
+	static int getPcapTimestampProvider(const PcapLiveDevice::TimestampProvider timestampProvider)
 	{
 		switch (timestampProvider)
 		{
 		case PcapLiveDevice::TimestampProvider::Host:
 			return PCAP_TSTAMP_HOST;
-		case PcapLiveDevice::TimestampProvider::HostLowPrec:
+		case PcapLiveDevice::TimestampProvider::HostLowPrecision:
 			return PCAP_TSTAMP_HOST_LOWPREC;
-		case PcapLiveDevice::TimestampProvider::HostHighPrec:
+		case PcapLiveDevice::TimestampProvider::HostHighPrecision:
 			return PCAP_TSTAMP_HOST_HIPREC;
 		case PcapLiveDevice::TimestampProvider::Adapter:
 			return PCAP_TSTAMP_ADAPTER;
 		case PcapLiveDevice::TimestampProvider::AdapterUnsynced:
 			return PCAP_TSTAMP_ADAPTER_UNSYNCED;
-		case PcapLiveDevice::TimestampProvider::HostHighPrecUnsynced:
+		case PcapLiveDevice::TimestampProvider::HostHighPrecisionUnsynced:
 			return PCAP_TSTAMP_HOST_HIPREC_UNSYNCED;
 		}
 		return PCAP_TSTAMP_HOST;
 	}
 
-	static int timestampPrecisionMap(const PcapLiveDevice::TimestampPrecision timestampPrecision)
+	static int getPcapPrecision(const PcapLiveDevice::TimestampPrecision timestampPrecision)
 	{
 		switch (timestampPrecision)
 		{
@@ -137,7 +137,8 @@ namespace pcpp
 	static bool isTimestampProviderSupportedByDevice(pcap_t* pcap,
 	                                                 const PcapLiveDevice::TimestampProvider timestampProvider)
 	{
-		const auto tstampType = timestampProviderMap(timestampProvider);
+#	ifdef PCAP_AVAILABLE_1_2
+		const auto tstampType = getPcapTimestampProvider(timestampProvider);
 
 		// Use unique_ptr with a custom deleter directly
 		std::unique_ptr<int[], void (*)(int*)> supportedTstampTypes(nullptr, [](int* ptr) {
@@ -151,8 +152,8 @@ namespace pcpp
 
 		if (numSupportedTstampTypes < 0)
 		{
-			std::cerr << "Error retrieving timestamp types: " << pcap_geterr(pcap) << " - default Host will be used"
-			          << std::endl;
+			PCPP_LOG_ERROR("Error retrieving timestamp types - default 'Host' will be used, error message: "
+			               << pcap_geterr(pcap) << "'");
 			return false;
 		}
 
@@ -169,6 +170,10 @@ namespace pcpp
 				return true;
 			}
 		}
+#	else
+		PCPP_LOG_ERROR("Error retrieving timestamp types - default 'Host' will be used. "
+		               << "pcap_list_tstamp_types is available only from libpcap 1.2");
+#	endif
 
 		return false;
 	}
@@ -177,7 +182,7 @@ namespace pcpp
 	{
 		if (isTimestampProviderSupportedByDevice(pcap, timestampProvider))
 		{
-			const int ret = pcap_set_tstamp_type(pcap, timestampProviderMap(timestampProvider));
+			const int ret = pcap_set_tstamp_type(pcap, getPcapTimestampProvider(timestampProvider));
 			if (ret == 0)
 			{
 				PCPP_LOG_DEBUG("Timestamp provider was set");
@@ -196,7 +201,7 @@ namespace pcpp
 
 	static void setTimestampPrecision(pcap_t* pcap, const PcapLiveDevice::TimestampPrecision timestampPrecision)
 	{
-		const int ret = pcap_set_tstamp_precision(pcap, timestampPrecisionMap(timestampPrecision));
+		const int ret = pcap_set_tstamp_precision(pcap, getPcapPrecision(timestampPrecision));
 		if (ret == 0)
 		{
 			PCPP_LOG_DEBUG("Timestamp precision was set");