Pull request #3313: event: add new static member update_and_get_event_id()

Merge in SNORT/snort3 from ~PUNEETKU/snort3:shun_event to master

Squashed commit of the following:

commit feac3000a18764a324203fd80fadfac3f7f4f8ab
Author: Puneeth Kumar C V <puneetku@cisco.com>
Date:   Thu Mar 17 18:48:38 2022 +0530

    event: add new static member update_and_get_event_id()

diff --git a/src/events/event.cc b/src/events/event.cc
index f798ba2c319e276e41c66ff742364ccc7511a3b6..1debf01d7f2b53c51e840f64a67ecd0cedaec64e 100644 (file)
--- a/src/events/event.cc
+++ b/src/events/event.cc
@@ -30,12 +30,12 @@ using namespace snort;
 
 static THREAD_LOCAL uint16_t g_event_id;
 
-SO_PUBLIC uint16_t get_event_id()
+uint16_t get_event_id()
 {
     return g_event_id;
 }
 
-SO_PUBLIC void incr_event_id()
+void incr_event_id()
 {
     g_event_id++;
 }
@@ -60,6 +60,15 @@ void Event::update_event_id_and_ref(uint16_t log_id)
     event_reference = event_id;
 }
 
+uint32_t Event::update_and_get_event_id(void)
+{
+    /* return event id based on g_event_id. */
+    incr_event_id();
+
+    return calc_event_id(g_event_id,
+        SnortConfig::get_conf()->get_event_log_id());
+}
+
 void Event::set_event(uint32_t gid, uint32_t sid, uint32_t rev,
     uint32_t classification, uint32_t priority, uint16_t event_ref,
     uint16_t log_id, const struct timeval& tv)
@@ -70,9 +79,7 @@ void Event::set_event(uint32_t gid, uint32_t sid, uint32_t rev,
     sig_info->class_id = classification;
     sig_info->priority = priority;
 
-    /* update event_id based on g_event_id. */
-    incr_event_id();
-    update_event_id(SnortConfig::get_conf()->get_event_log_id());
+    event_id = update_and_get_event_id();
 
     if (event_ref)
         event_reference = calc_event_id(event_ref, log_id);

diff --git a/src/events/event.h b/src/events/event.h
index 570d0deb1f6d772ec66a48174be721032670d95c..e81160554275ad86f41d8a89e49a7fd3429b9a41 100644 (file)
--- a/src/events/event.h
+++ b/src/events/event.h
@@ -52,6 +52,7 @@ struct Event
 
     void update_event_id(uint16_t log_id);
     void update_event_id_and_ref(uint16_t log_id);
+    SO_PUBLIC static uint32_t update_and_get_event_id();
 
     void set_event(uint32_t gid, uint32_t sid, uint32_t rev,
         uint32_t classification, uint32_t priority, uint16_t event_ref,