From: Steve Chew (stechew) Date: Mon, 5 Dec 2022 17:41:23 +0000 (+0000) Subject: Pull request #3685: geneve: If daq has the capability, do not bypass geneve tunnel X-Git-Tag: 3.1.49.0~11 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d7a46c4c327564ec88d89ee105ad56035d14991;p=thirdparty%2Fsnort3.git Pull request #3685: geneve: If daq has the capability, do not bypass geneve tunnel Merge in SNORT/snort3 from ~RAMANKS/snort3:geneve to master Squashed commit of the following: commit 169354f17567c641331058dfde01b03934790486 Author: Raman Krishnan Date: Tue Nov 29 16:07:44 2022 -0800 geneve: If daq has the capability, do not bypass geneve tunnel --- diff --git a/cmake/FindDAQ.cmake b/cmake/FindDAQ.cmake index bf5f66fed..3959f97a4 100644 --- a/cmake/FindDAQ.cmake +++ b/cmake/FindDAQ.cmake @@ -16,7 +16,7 @@ This module defines: #]=======================================================================] find_package(PkgConfig) -pkg_check_modules(PC_DAQ libdaq>=3.0.7) +pkg_check_modules(PC_DAQ libdaq>=3.0.10) # Use DAQ_INCLUDE_DIR_HINT and DAQ_LIBRARIES_DIR_HINT from configure_cmake.sh as primary hints # and then package config information after that. diff --git a/src/packet_io/sfdaq_instance.cc b/src/packet_io/sfdaq_instance.cc index 49531c6cd..4e9a01252 100644 --- a/src/packet_io/sfdaq_instance.cc +++ b/src/packet_io/sfdaq_instance.cc @@ -236,6 +236,8 @@ void SFDAQInstance::get_tunnel_capabilities() daq_tunnel_mask |= TUNNEL_6IN6; if (caps & DAQ_CAPA_DECODE_MPLS) daq_tunnel_mask |= TUNNEL_MPLS; + if (caps & DAQ_CAPA_DECODE_GENEVE) + daq_tunnel_mask |= TUNNEL_GENEVE; } }