added --dump-version

diff --git a/src/main/help.cc b/src/main/help.cc
index 994a607ab66e623ba01b3a2c18d4cbcc4f359252..92f08abe84e5ada15bc985fa9c240b0985870da9 100644 (file)
--- a/src/main/help.cc
+++ b/src/main/help.cc
@@ -289,6 +289,12 @@ void dump_rule_text(SnortConfig*, const char* val)
     exit(0);
 }
 
+void dump_version(SnortConfig*, const char*)
+{
+    cout << VERSION << endl;
+    exit(0);
+}
+
 void help_version(SnortConfig*, const char*)
 {
     DisplayBanner();

diff --git a/src/main/help.h b/src/main/help.h
index 51d49efb767e5390882adcaadfe5eff067c98628..a46ed2aecba31480ef10e4106b499c8e97d5a657 100644 (file)
--- a/src/main/help.h
+++ b/src/main/help.h
@@ -51,6 +51,7 @@ void dump_builtin_rules(SnortConfig* sc, const char*);
 void dump_dynamic_rules(SnortConfig* sc, const char*);
 void dump_rule_hex(SnortConfig* sc, const char*);
 void dump_rule_text(SnortConfig* sc, const char*);
+void dump_version(SnortConfig* sc, const char*);
 
 #endif
 

diff --git a/src/main/snort_module.cc b/src/main/snort_module.cc
index 1b9318e271e8aa5522787463f8da3ae728d2a757..587c4344adcde5505c10421360b08ffad59a0bfd 100644 (file)
--- a/src/main/snort_module.cc
+++ b/src/main/snort_module.cc
@@ -261,6 +261,9 @@ static const Parameter s_params[] =
     { "--daq-var", Parameter::PT_STRING, nullptr, nullptr,
       "<name=value> specify extra DAQ configuration variable" },
 
+    { "--dirty-pig", Parameter::PT_IMPLIED, nullptr, nullptr,
+      "don't flush packets on shutdown" },
+
     { "--dump-builtin-rules", Parameter::PT_IMPLIED, nullptr, nullptr,
       "[<module prefix>] output stub rules for selected modules" },
 
@@ -268,12 +271,12 @@ static const Parameter s_params[] =
     { "--dump-dynamic-rules", Parameter::PT_IMPLIED, nullptr, nullptr,
       "output stub rules for all loaded rules libraries" },
 
-    { "--dirty-pig", Parameter::PT_IMPLIED, nullptr, nullptr,
-      "don't flush packets on shutdown" },
-
     { "--dump-defaults", Parameter::PT_STRING, "(optional)", nullptr,
       "[<module prefix>] output module defaults in Lua format" },
 
+    { "--dump-version", Parameter::PT_STRING, "(optional)", nullptr,
+      "output the version, the whole version, and only the version" },
+
     { "--enable-inline-test", Parameter::PT_IMPLIED, nullptr, nullptr,
       "enable Inline-Test Mode Operation" },
 
@@ -634,18 +637,21 @@ bool SnortModule::set(const char*, Value& v, SnortConfig* sc)
     else if ( v.is("--daq-var") )
         ConfigDaqVar(sc, v.get_string());
 
+    else if ( v.is("--dirty-pig") )
+        ConfigDirtyPig(sc, v.get_string());
+
     else if ( v.is("--dump-builtin-rules") )
         dump_builtin_rules(sc, v.get_string());
 
     else if ( v.is("--dump-dynamic-rules") )
         dump_dynamic_rules(sc, v.get_string());
 
-    else if ( v.is("--dirty-pig") )
-        ConfigDirtyPig(sc, v.get_string());
-
     else if ( v.is("--dump-defaults") )
         dump_defaults(sc, v.get_string());
 
+    else if ( v.is("--dump-version") )
+        dump_version(sc, v.get_string());
+
     else if ( v.is("--enable-inline-test") )
         sc->run_flags |= RUN_FLAG__INLINE_TEST;