Pull request #4327: src: udpate to resolve new issues

Merge in SNORT/snort3 from ~YVELYKOZ/snort3:issue_testing to master

Squashed commit of the following:

commit 43607a31ae832f04c0bbb817a4c02521ee251cf0
Author: Yehor Velykozhon <yvelykoz@cisco.com>
Date:   Mon May 27 17:51:24 2024 +0300

    utils: add explicit include

commit 01345fc769b93113fcd8b3e601f6aa0dc0d4190c
Author: Yehor Velykozhon <yvelykoz@cisco.com>
Date:   Mon May 27 17:10:09 2024 +0300

    src: remove repetitive words

    Thanks @gopherorg for finding those typos

commit 18f85f347bf58f774da72063bf7bd07588e80d50
Author: Yehor Velykozhon <yvelykoz@cisco.com>
Date:   Fri May 17 15:55:00 2024 +0300

    src: udpate to resolve new issues

diff --git a/src/protocols/packet.h b/src/protocols/packet.h
index 475fe5b5293c84a3663ee5aea5753afc7e74a001..de46a25d96c9502166b9982d556c1ebd507d87a0 100644 (file)
--- a/src/protocols/packet.h
+++ b/src/protocols/packet.h
@@ -144,7 +144,7 @@ struct SO_PUBLIC Packet
     ActiveAction** action = nullptr;
     ActiveAction* action_inst = nullptr;
 
-    DAQ_Msg_h daq_msg;              // DAQ message this packet came from
+    DAQ_Msg_h daq_msg = nullptr;            // DAQ message this packet came from
     SFDAQInstance* daq_instance = nullptr;  // DAQ instance the message came from
 
     // Everything beyond this point is set by PacketManager::decode()

diff --git a/src/pub_sub/test/pub_sub_eve_process_event_test.cc b/src/pub_sub/test/pub_sub_eve_process_event_test.cc
index f2e8fc2726bd02e69e0596b584d8b130b31cc6bc..194a2aaaa33f0df3be4b474319a52b0b971931f8 100644 (file)
--- a/src/pub_sub/test/pub_sub_eve_process_event_test.cc
+++ b/src/pub_sub/test/pub_sub_eve_process_event_test.cc
@@ -34,7 +34,7 @@ Packet::Packet(bool)
     : flow(nullptr), packet_flags(0), xtradata_mask(0), proto_bits(0), alt_dsize(0), num_layers(0),
     disable_inspect(true), sect(PS_NONE), active_inst(nullptr), pkth(nullptr), pkt(nullptr), layers(nullptr),
     user_inspection_policy_id(0), user_ips_policy_id(0), user_network_policy_id(0), inspection_started_timestamp(0), vlan_idx(0),
-    ts_packet_flags(0), allocated(false)
+    ts_packet_flags(0), allocated(false), daq_msg(nullptr)
 { }
 Packet::~Packet() = default;
 

diff --git a/src/service_inspectors/dce_rpc/dce_co.cc b/src/service_inspectors/dce_rpc/dce_co.cc
index 12129cf834766a6b102915b5974068e54bdf0321..600e13da290dc796872e1913358bc7c1e6546aeb 100644 (file)
--- a/src/service_inspectors/dce_rpc/dce_co.cc
+++ b/src/service_inspectors/dce_rpc/dce_co.cc
@@ -774,7 +774,7 @@ static DCE2_CoCtxIdNode* dce_co_process_ctx_id(DCE2_SsnData* sd,DCE2_CoTracker*
  * Context ids and associated uuids are stored in a queue and
  * dequeued upon server response.  Server response doesn't
  * indicate by context id which bindings were accepted or
- * rejected, but the index or order they were in in the client
+ * rejected, but the index or order they were in the client
  * bind or alter context, hence the queue.
  *
  ********************************************************************/

diff --git a/src/stream/paf.cc b/src/stream/paf.cc
index 22dde5f7849367581b49862a028d69d2fb78fded..f07f7a46d521b62c9da90e6dee6a53126f2cc842 100644 (file)
--- a/src/stream/paf.cc
+++ b/src/stream/paf.cc
@@ -298,7 +298,7 @@ int32_t paf_check (
     // occurs at the paf_max byte. So, we manually set the data's length and
     // total queued bytes (px.len) to guarantee that at most paf_max bytes will
     // be analyzed and flushed since the last flush point.  It should also be
-    // noted that we perform the check here rather in in paf_flush() to
+    // noted that we perform the check here rather in paf_flush() to
     // avoid scanning the same data twice. The first scan would analyze the
     // entire segment and the second scan would analyze this segments
     // unflushed data.

diff --git a/src/utils/util.cc b/src/utils/util.cc
index 80561ad524665f039c426ab045ba0e9b06be826f..4de7a6492e3a5c7b1172b6588aaafb3236455649 100644 (file)
--- a/src/utils/util.cc
+++ b/src/utils/util.cc
@@ -24,6 +24,7 @@
 
 #include "util.h"
 
+#include <sys/resource.h>
 #include <sys/stat.h>
 
 #include <chrono>

diff --git a/tools/snort2lua/data/dt_data.h b/tools/snort2lua/data/dt_data.h
index 38f67d375d736bec9880dd43239da9c7a9f610d3..a612d3c102191e67c2558c811a8b20e5b004fa76 100644 (file)
--- a/tools/snort2lua/data/dt_data.h
+++ b/tools/snort2lua/data/dt_data.h
@@ -37,7 +37,7 @@
 // data (variables, includes, etcs), one api for creating tables. Hoever,
 // the reason they are together is because this class is not static, and I
 // did not want to be pass three pointers to the three API's when creating
-// new conversion states.  There are comments in in all caps which show the
+// new conversion states.  There are comments in all caps which show the
 // separate the sections.
 
 // The first section of this file is really DataApi creation and