File pcap++-dpdk.patch of Package pcapplusplus

Overview Repositories Revisions Requests Users Attributes Meta

File pcap++-dpdk.patch of Package pcapplusplus (Revision d4c9424a980442615e92b3b129b86cbb)

Currently displaying revision d4c9424a980442615e92b3b129b86cbb , Show latest

Index: PcapPlusPlus-17.11/Pcap++/Makefile
===================================================================
--- PcapPlusPlus-17.11.orig/Pcap++/Makefile
+++ PcapPlusPlus-17.11/Pcap++/Makefile
@@ -54,7 +54,7 @@ ifdef PF_RING_HOME
 INCLUDES += -I$(PF_RING_HOME)/userland/lib -I$(PF_RING_HOME)/kernel
 endif
 ifdef USE_DPDK
-INCLUDES += -I"$(RTE_SDK)/build/include"
+INCLUDES += -I$(RTE_SDK) -I$(RTE_SDK)/$(RTE_TARGET)
 endif
 
 ifdef HAS_PCAP_IMMEDIATE_MODE
Index: PcapPlusPlus-17.11/Pcap++/src/DpdkDevice.cpp
===================================================================
--- PcapPlusPlus-17.11.orig/Pcap++/src/DpdkDevice.cpp
+++ PcapPlusPlus-17.11/Pcap++/src/DpdkDevice.cpp
@@ -8,6 +8,11 @@
 #include <DpdkDevice.h>
 #include <DpdkDeviceList.h>
 #include <Logger.h>
+#include "rte_version.h"
+#if (RTE_VER_YEAR > 17) || (RTE_VER_YEAR == 17 && RTE_VER_MONTH >= 11)
+#include "rte_bus_pci.h"
+#endif
+#include "rte_pci.h"
 #include "rte_config.h"
 #include "rte_ethdev.h"
 #include "rte_errno.h"
Index: PcapPlusPlus-17.11/Pcap++/src/DpdkDeviceList.cpp
===================================================================
--- PcapPlusPlus-17.11.orig/Pcap++/src/DpdkDeviceList.cpp
+++ PcapPlusPlus-17.11/Pcap++/src/DpdkDeviceList.cpp
@@ -32,7 +32,7 @@
 #include <rte_ring.h>
 #include <rte_mempool.h>
 #include <rte_mbuf.h>
-
+#include <rte_version.h>
 
 #include <sstream>
 #include <iomanip>
@@ -251,15 +251,26 @@ SystemCore DpdkDeviceList::getDpdkMaster
 
 void DpdkDeviceList::setDpdkLogLevel(LoggerPP::LogLevel logLevel)
 {
+#if (RTE_VER_YEAR > 17) || (RTE_VER_YEAR == 17 && RTE_VER_MONTH >= 11)
+	if (logLevel == LoggerPP::Normal)
+		rte_log_set_global_level(RTE_LOG_NOTICE);
+	else // logLevel == LoggerPP::Debug
+		rte_log_set_global_level(RTE_LOG_DEBUG);
+#else
 	if (logLevel == LoggerPP::Normal)
 		rte_set_log_level(RTE_LOG_NOTICE);
 	else // logLevel == LoggerPP::Debug
 		rte_set_log_level(RTE_LOG_DEBUG);
+#endif
 }
 
 LoggerPP::LogLevel DpdkDeviceList::getDpdkLogLevel()
 {
+#if (RTE_VER_YEAR > 17) || (RTE_VER_YEAR == 17 && RTE_VER_MONTH >= 11)
+	if (rte_log_get_global_level() <= RTE_LOG_NOTICE)
+#else
 	if (rte_get_log_level() <= RTE_LOG_NOTICE)
+#endif
 		return LoggerPP::Normal;
 	else
 		return LoggerPP::Debug;

Places

File pcap++-dpdk.patch of Package pcapplusplus (Revision d4c9424a980442615e92b3b129b86cbb)

Places