From: Oleksii Shumeiko -X (oshumeik - SOFTSERVE INC at Cisco) <oshumeik@cisco.com>
Date: Tue, 25 Mar 2025 11:48:55 +0000 (+0000)
Subject: Pull request #4674: PID into dump file name
X-Git-Tag: 3.7.2.0~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2a546f3366ca4619bc568bf0af03424c8b981bc3;p=thirdparty%2Fsnort3.git

Pull request #4674: PID into dump file name

Merge in SNORT/snort3 from ~OSHUMEIK/snort3:cfg_dump_pid to master

Squashed commit of the following:

commit 818389e207fe57ac24e3095dbc42f4cf9eeeff35
Author: Oleksii Shumeiko <oshumeik@cisco.com>
Date:   Mon Mar 24 15:45:24 2025 +0200

    dump_config: include PID into dump file name
---

diff --git a/doc/user/dump_config.txt b/doc/user/dump_config.txt
index 7cd4ca10d..6b736788b 100644
--- a/doc/user/dump_config.txt
+++ b/doc/user/dump_config.txt
@@ -10,9 +10,8 @@ The dump mode is activated by the following options:
 --dump-config-text, --dump-config=all, --dump-config=top.
 They are described in detail below.
 
-The --gen-dump-config <file> option enables Snort to generate a dump
-configuration file with a timestamp and config generation ID
-during startup and reload.
+The --gen-dump-config <file> option enables Snort to dump configuration to
+a file with PID, timestamp, and config generation ID during startup and reload.
 
 The simple configuration is used in examples.
 The output contains applied configurations (defaults and configured).
diff --git a/src/main/snort_config.cc b/src/main/snort_config.cc
index cf2d1628d..27a2d5ec8 100644
--- a/src/main/snort_config.cc
+++ b/src/main/snort_config.cc
@@ -28,6 +28,8 @@
 #include <mutex>
 #include <pwd.h>
 #include <syslog.h>
+#include <sys/types.h>
+#include <unistd.h>
 #include <unordered_map>
 
 #include "actions/ips_actions.h"
@@ -219,6 +221,8 @@ static void generate_config_dump(std::list<ConfigData*> *config_data, time_t tim
 {
     ++threads_cnt;
 
+    file_name += "_";
+    file_name += std::to_string(getpid());
     file_name += "_";
     file_name += std::to_string(timestamp);
     file_name += "_";
diff --git a/src/main/snort_module.cc b/src/main/snort_module.cc
index 433398784..2f421f8c4 100644
--- a/src/main/snort_module.cc
+++ b/src/main/snort_module.cc
@@ -435,7 +435,7 @@ static const Parameter s_params[] =
       "enable features used in testing" },
 
     { "--gen-dump-config", Parameter::PT_STRING, nullptr, nullptr,
-      "<file> dump configuration to <file_timestamp> during startup and configuration reload" },
+      "<file> dump configuration to a file during startup and configuration reload" },
 
     { "--gen-msg-map", Parameter::PT_IMPLIED, nullptr, nullptr,
       "dump configured rules in gen-msg.map format for use by other tools" },