Merge pull request #1360 in SNORT/snort3 from ubuntu_check_fix to master

Squashed commit of the following:

commit 454dbec3a299148501df08b6fbe11fa20f04d1bb
Author: Masud Hasan <mashasan@cisco.com>
Date:   Mon Sep 17 12:27:06 2018 -0400

    appid: Fixing ubuntu check tests

diff --git a/src/network_inspectors/appid/test/appid_discovery_test.cc b/src/network_inspectors/appid/test/appid_discovery_test.cc
index d8022038621e47299d1e008c8ed6f4765dbbad1f..31d57ced5eaa65767c97ae19e35c0c35c0284849 100644 (file)
--- a/src/network_inspectors/appid/test/appid_discovery_test.cc
+++ b/src/network_inspectors/appid/test/appid_discovery_test.cc
@@ -301,6 +301,7 @@ TEST(appid_discovery_tests, event_published_when_ignoring_flow)
     databus_publish_called = false;
     test_log[0] = '\0';
     Packet p;
+    p.packet_flags = 0;
     DAQ_PktHdr_t pkth;
     p.pkth = &pkth;
     SfIp ip;
@@ -331,6 +332,7 @@ TEST(appid_discovery_tests, event_published_when_processing_flow)
     databus_publish_called = false;
     test_log[0] = '\0';
     Packet p;
+    p.packet_flags = 0;
     DAQ_PktHdr_t pkth;
     p.pkth = &pkth;
     SfIp ip;
@@ -386,6 +388,7 @@ TEST(appid_discovery_tests, change_bits_for_non_http_appid)
     // Testing FTP appid
     databus_publish_called = false;
     Packet p;
+    p.packet_flags = 0;
     DAQ_PktHdr_t pkth;
     p.pkth = &pkth;
     SfIp ip;