Merge pull request #175 in SNORT/snort3 from ~JOCORNET/snort3:fix_daq_warnings to...

Squashed commit of the following:

commit dcdf45b46b58a17552387d57558e7cefbc2bf5b3
Author: Joel Cornett <joel.cornett@gmail.com>
Date:   Wed Dec 9 16:39:37 2015 -0500

    update cmake to use ISO 99

commit 08fe75aea9b647df2ff3d9eef5369e88e624c918
Author: Joel Cornett <joel.cornett@gmail.com>
Date:   Tue Dec 8 16:07:29 2015 -0500

    added initializer for dp_add_dc DAQ api field

commit 79731b8a6c30b555cf5ef2c565eb941b84505d0b
Author: Joel Cornett <joel.cornett@gmail.com>
Date:   Tue Dec 8 16:00:40 2015 -0500

    fixed gcc warnings for daqs

diff --git a/daqs/CMakeLists.txt b/daqs/CMakeLists.txt
index e1d5c995e6a3ad37e7f69f2c7b0711eec78ceb56..120c01d9f447a95237013d2551e26da8dff1a4a2 100644 (file)
--- a/daqs/CMakeLists.txt
+++ b/daqs/CMakeLists.txt
@@ -15,6 +15,9 @@ include_directories(AFTER ${EXTERNAL_INCLUDES})
 add_shared_library(daq_file daqs daq_file.c daq_user.h)
 add_shared_library(daq_hext daqs daq_hext.c daq_user.h)
 
+set_property(TARGET daq_file PROPERTY C_STANDARD 99)
+set_property(TARGET daq_hext PROPERTY C_STANDARD 99)
+
 install (FILES ${DAQS_INCLUDES}
     DESTINATION "${INCLUDE_INSTALL_PATH}/daqs"
 )

diff --git a/daqs/daq_file.c b/daqs/daq_file.c
index 374150157ef6a895f985fc8e4f3b69fb2bc5eb07..5253cd96cefeff0570350dc08bd056041cc713b2 100644 (file)
--- a/daqs/daq_file.c
+++ b/daqs/daq_file.c
@@ -149,9 +149,6 @@ static void set_pkt_hdr(FileImpl* impl, DAQ_PktHdr_t* phdr, ssize_t len)
     phdr->priv_ptr = &impl->pci;
 }
 
-// forward all but drops, retries and blacklists:
-static const int s_fwd[MAX_DAQ_VERDICT] = { 1, 0, 1, 1, 0, 1, 0 };
-
 static int file_daq_process(
     FileImpl* impl, DAQ_Analysis_Func_t cb, void* user)
 {
@@ -397,5 +394,6 @@ DAQ_Module_t file_daq_module_data =
     .hup_prep = NULL,
     .hup_apply = NULL,
     .hup_post = NULL,
+    .dp_add_dc = NULL
 };
 

diff --git a/daqs/daq_hext.c b/daqs/daq_hext.c
index 03213a9bfac172219f6f2b287ffd0444885e3397..64e7b41a223a03342d10949219073217a3746051 100644 (file)
--- a/daqs/daq_hext.c
+++ b/daqs/daq_hext.c
@@ -382,9 +382,6 @@ static void set_pkt_hdr(FileImpl* impl, DAQ_PktHdr_t* phdr, ssize_t len)
     phdr->priv_ptr = &impl->pci;
 }
 
-// forward all but drops, retries and blacklists:
-static const int s_fwd[MAX_DAQ_VERDICT] = { 1, 0, 1, 1, 0, 1, 0 };
-
 static int hext_daq_process(
     FileImpl* impl, DAQ_Analysis_Func_t cb, void* user)
 {
@@ -634,5 +631,6 @@ DAQ_Module_t hext_daq_module_data =
     .hup_prep = NULL,
     .hup_apply = NULL,
     .hup_post = NULL,
+    .dp_add_dc = NULL
 };