Snort2Lua finalized and Makefile support added

diff --git a/configure.ac b/configure.ac
index 6cbb1bc19f7c4b73079d0454e37894b89048f82b..58ee79a8974c8cd360484676537bec81ca3f330b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -801,7 +801,7 @@ CXXFLAGS="$CFLAGS"
 echo "$AM_CFLAGS $CFLAGS" > cflags.out
 echo "$AM_CPPFLAGS $CPPFLAGS" > cppflags.out
 
-AM_CPPFLAGS='-I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/main -I$(top_srcdir)/src/parser -I$(top_srcdir)/src/utils -I$(top_srcdir)/src/loggers -I$(top_srcdir)/src/time -I$(top_srcdir)/src/protocols -I$(top_srcdir)/src/network_inspectors -I$(top_srcdir)/src/log -I$(top_srcdir)/src/events -I$(top_srcdir)/src/sfip -I$(top_srcdir)/src/detection -I$(top_srcdir)/src/hash' 
+AM_CPPFLAGS='-I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/main -I$(top_srcdir)/src/parser -I$(top_srcdir)/src/utils -I$(top_srcdir)/src/loggers -I$(top_srcdir)/src/time -I$(top_srcdir)/src/protocols -I$(top_srcdir)/src/network_inspectors -I$(top_srcdir)/src/log -I$(top_srcdir)/src/events -I$(top_srcdir)/src/sfip -I$(top_srcdir)/src/detection -I$(top_srcdir)/src/hash -I$(top_srcdir)/tools/snort2lua'
 
 AC_SUBST(AM_CPPFLAGS)
 AC_SUBST(AM_CXXFLAGS)
@@ -869,6 +869,14 @@ etc/Makefile \
 tools/Makefile \
 tools/u2boat/Makefile \
 tools/u2spewfoo/Makefile \
+tools/snort2lua/Makefile \
+tools/snort2lua/config_states/Makefile \
+tools/snort2lua/data/Makefile \
+tools/snort2lua/keyword_states/Makefile \
+tools/snort2lua/output_states/Makefile \
+tools/snort2lua/preprocessor_states/Makefile \
+tools/snort2lua/rule_states/Makefile \
+tools/snort2lua/utils/Makefile \
 ])
 
 AC_OUTPUT

diff --git a/src/codecs/link/cd_eapol_module.cc b/src/codecs/link/cd_eapol_module.cc
index 831918c8f90cad57f06b18bb7cd040ee35f47770..c6dbd946b925973e5822d104555a0181a077a8e5 100644 (file)
--- a/src/codecs/link/cd_eapol_module.cc
+++ b/src/codecs/link/cd_eapol_module.cc
@@ -39,3 +39,5 @@ EapolModule::EapolModule() : DecodeModule(CD_EAPOL_NAME)
 const RuleMap* EapolModule::get_rules() const
 { return eapol_rules; }
 
+bool EapolModule::set(const char* /*fqn*/, Value& /*v*/, SnortConfig* /*sc*/)
+{ return true; }

diff --git a/src/codecs/root/cd_wlan_module.cc b/src/codecs/root/cd_wlan_module.cc
index ed9fa3fadff6996e8254b438062fd3287157a02e..2dfbeb38e7887fba83d78ecf38c72d68db88c73f 100644 (file)
--- a/src/codecs/root/cd_wlan_module.cc
+++ b/src/codecs/root/cd_wlan_module.cc
@@ -38,3 +38,5 @@ WlanCodecModule::WlanCodecModule() : DecodeModule(CD_WLAN_NAME)
 const RuleMap* WlanCodecModule::get_rules() const
 { return wifi_rules; }
 
+bool WlanCodecModule::set(const char* /*fqn*/, Value& /*v*/, SnortConfig* /*sc*/)
+{ return true; }

diff --git a/tools/Makefile.am b/tools/Makefile.am
index f8b7c78cbf951f3e4050685145caee4653e110cf..2ffabcb755d8bb8516093c70252a3268a561a1d0 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -2,6 +2,7 @@ AUTOMAKE_OPTIONS=foreign no-dependencies
 
 SUBDIRS = \
 u2boat \
-u2spewfoo
+u2spewfoo \
+snort2lua
 
 AM_CXXFLAGS = @AM_CXXFLAGS@

diff --git a/tools/snort2lua/CMakeLists.txt b/tools/snort2lua/CMakeLists.txt
index 0bb2d9a302de28df56720cd3b59d32ba1c123614..d9aa3982f970c4a49b8c81bb7e7ea6fbb068f419 100644 (file)
--- a/tools/snort2lua/CMakeLists.txt
+++ b/tools/snort2lua/CMakeLists.txt
@@ -8,7 +8,7 @@ add_subdirectory(preprocessor_states)
 add_subdirectory(output_states)
 add_subdirectory(config_states)
 add_subdirectory(rule_states)
-add_subdirectory(util)
+add_subdirectory(utils)
 
 if (BUILD_UNIT_TESTS)
 if (0)
@@ -26,7 +26,7 @@ add_executable( snort2lua
 
 target_link_libraries( snort2lua
     conversion_data
-    util
+    snort2lua_utils
     keyword_states
     output_states
     preprocessor_states

diff --git a/tools/snort2lua/Makefile.am b/tools/snort2lua/Makefile.am
new file mode 100644 (file)
index 0000000..0348286
--- /dev/null
+++ b/tools/snort2lua/Makefile.am
@@ -0,0 +1,33 @@
+AUTOMAKE_OPTIONS=foreign  no-dependencies
+
+bin_PROGRAMS = snort2lua
+
+snort2lua_SOURCES = \
+conversion_state.h \
+option_parser.h \
+init_state.h \
+snort2lua.cc \
+init_state.cc
+
+snort2lua_LDADD = \
+utils/libsnort2lua_utils.a \
+data/libdata.a \
+keyword_states/libkeyword_states.a \
+preprocessor_states/libpreprocessor_states.a \
+output_states/liboutput_states.a \
+config_states/libconfig_states.a \
+rule_states/librule_states.a
+
+snort2lua_CFLAGS = @CFLAGS@ $(AM_CFLAGS)
+
+SUBDIRS = \
+utils \
+data \
+keyword_states \
+preprocessor_states \
+output_states \
+config_states \
+rule_states
+
+AM_CXXFLAGS = @AM_CXXFLAGS@
+

diff --git a/tools/snort2lua/config_states/Makefile.am b/tools/snort2lua/config_states/Makefile.am
new file mode 100644 (file)
index 0000000..e031fd0
--- /dev/null
+++ b/tools/snort2lua/config_states/Makefile.am
@@ -0,0 +1,35 @@
+AUTOMAKE_OPTIONS=foreign no-dependencies
+
+
+noinst_LIBRARIES = libconfig_states.a
+
+libconfig_states_a_SOURCES = \
+config_binding.cc \
+config_checksums.cc \
+config_classification.cc \
+config_decode_esp.cc \
+config_default_rule_state.cc \
+config_deleted.cc \
+config_detection.cc \
+config_event_trace.cc \
+config_file.cc \
+config_event_queue.cc \
+config_ignore_ports.cc \
+config_ipv6_frag.cc \
+config_memcaps.cc \
+config_mpls_payload_type.cc \
+config_no_option.cc \
+config_one_int_option.cc \
+config_one_string_option.cc \
+config_order.cc \
+config_ppm.cc \
+config_profile.cc \
+config_reference.cc \
+config_response.cc \
+config_tunnel_verdicts.cc \
+config_api.h \
+config_api.cc
+
+
+AM_CXXFLAGS = @AM_CXXFLAGS@
+

diff --git a/tools/snort2lua/config_states/config_api.cc b/tools/snort2lua/config_states/config_api.cc
index 25e969aecbbf7128d555aaeca7afcc9bd6aabb79..4d0ed85fc5e274a16d501e0a5331313b8f11a01d 100644 (file)
--- a/tools/snort2lua/config_states/config_api.cc
+++ b/tools/snort2lua/config_states/config_api.cc
@@ -102,7 +102,7 @@ extern const ConvertMap* mpls_payload_type_map;
 extern const ConvertMap* min_ttl_map;
 extern const ConvertMap* new_ttl_map;
 extern const ConvertMap* nolog_map;
-extern const ConvertMap* nopcre_map;;
+extern const ConvertMap* nopcre_map;
 extern const ConvertMap* no_promisc_map;
 extern const ConvertMap* obfuscate_map;
 extern const ConvertMap* order_map;

diff --git a/tools/snort2lua/config_states/config_binding.cc b/tools/snort2lua/config_states/config_binding.cc
index ad989e8757d4a40b1b17de99b11a8a4e5d9b7374..fae9880af6f1d0f23ea82b42867a9f3f5c22298c 100644 (file)
--- a/tools/snort2lua/config_states/config_binding.cc
+++ b/tools/snort2lua/config_states/config_binding.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace config
 {

diff --git a/tools/snort2lua/config_states/config_checksums.cc b/tools/snort2lua/config_states/config_checksums.cc
index 066c4d4eb98a54f33cf3d632e6ab33a04d834b29..e95fa4193538d5c37fa2c0d3f0e8339dbab0d337 100644 (file)
--- a/tools/snort2lua/config_states/config_checksums.cc
+++ b/tools/snort2lua/config_states/config_checksums.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace config
 {

diff --git a/tools/snort2lua/config_states/config_classification.cc b/tools/snort2lua/config_states/config_classification.cc
index 3ebdc54d5b56889df6e837059af0e4484c92bce0..b1be84fbf371a86eb736a4c456ae897919cafbc4 100644 (file)
--- a/tools/snort2lua/config_states/config_classification.cc
+++ b/tools/snort2lua/config_states/config_classification.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace config
 {

diff --git a/tools/snort2lua/config_states/config_decode_esp.cc b/tools/snort2lua/config_states/config_decode_esp.cc
index 5c798004df1446f7f41cd02e5496b6bf40a831a4..ae8bf18026c13d18a40744cf761e9093eda1eb71 100644 (file)
--- a/tools/snort2lua/config_states/config_decode_esp.cc
+++ b/tools/snort2lua/config_states/config_decode_esp.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace config
 {

diff --git a/tools/snort2lua/config_states/config_default_rule_state.cc b/tools/snort2lua/config_states/config_default_rule_state.cc
index a42084fd450382265f05d1da245282b5e49dec41..9d50cf9e3780f2d6154b6d4ef9d2da998e17948a 100644 (file)
--- a/tools/snort2lua/config_states/config_default_rule_state.cc
+++ b/tools/snort2lua/config_states/config_default_rule_state.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace config
 {

diff --git a/tools/snort2lua/config_states/config_deleted.cc b/tools/snort2lua/config_states/config_deleted.cc
index 1d96f23f5443e68b446ebf1f93372c5a96b861ab..1035defc4d7db16feae62cdd813154610b10c91b 100644 (file)
--- a/tools/snort2lua/config_states/config_deleted.cc
+++ b/tools/snort2lua/config_states/config_deleted.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace config
 {
@@ -56,7 +56,7 @@ static ConversionState* deleted_ctor(Converter* cv, LuaData* ld)
     if (!ld->is_quiet_mode())
     {
         ld->open_table("deleted_snort_config_options");
-        ld->add_deprecated_comment("config " + *snort_option + "[:.*]");
+        ld->add_deleted_comment("config " + *snort_option + "[:.*]");
         ld->close_table();
     }
 

diff --git a/tools/snort2lua/config_states/config_detection.cc b/tools/snort2lua/config_states/config_detection.cc
index 6452f69cab09222dc736a57fd826694e65b46084..56141900a9521da04aa0a26c9d70017e44807e48 100644 (file)
--- a/tools/snort2lua/config_states/config_detection.cc
+++ b/tools/snort2lua/config_states/config_detection.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace config
 {
@@ -197,7 +197,7 @@ bool Detection::convert(std::istringstream& data_stream)
                 new_method = "lowmem";
 
             else if (!method.compare("mwm"))
-                ld->add_deprecated_comment("mwm");
+                ld->add_deleted_comment("mwm");
 
             else if (!method.compare("ac-split"))
             {

diff --git a/tools/snort2lua/config_states/config_event_queue.cc b/tools/snort2lua/config_states/config_event_queue.cc
index b5d80e92e680c2dff9b23ee02c9ccc0b3b5803ab..54fe53f67136a2bec1543afb42c0c0b5fe4ecbde 100644 (file)
--- a/tools/snort2lua/config_states/config_event_queue.cc
+++ b/tools/snort2lua/config_states/config_event_queue.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace config
 {

diff --git a/tools/snort2lua/config_states/config_event_trace.cc b/tools/snort2lua/config_states/config_event_trace.cc
index ee971002ddbf851e557961666c44cd6cd45718a9..eacbd3de5a9c1434e73fa07f710f185756b92a8c 100644 (file)
--- a/tools/snort2lua/config_states/config_event_trace.cc
+++ b/tools/snort2lua/config_states/config_event_trace.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace config
 {

diff --git a/tools/snort2lua/config_states/config_file.cc b/tools/snort2lua/config_states/config_file.cc
index ca9a164c62e0fa046e34c92a105ec3ffc7e87a13..5a9f813339eca6be3e35afc999ac516686a44c7b 100644 (file)
--- a/tools/snort2lua/config_states/config_file.cc
+++ b/tools/snort2lua/config_states/config_file.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace config
 {

diff --git a/tools/snort2lua/config_states/config_ignore_ports.cc b/tools/snort2lua/config_states/config_ignore_ports.cc
index 8a546a1c25c6354dbecb22013712b3aa0d669546..8ab55d50f6b413072b7eb372b3e840f87574d23b 100644 (file)
--- a/tools/snort2lua/config_states/config_ignore_ports.cc
+++ b/tools/snort2lua/config_states/config_ignore_ports.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace config
 {

diff --git a/tools/snort2lua/config_states/config_ipv6_frag.cc b/tools/snort2lua/config_states/config_ipv6_frag.cc
index 0cdcfed7a803549bcb92e6b705173112de61d400..30d40fd5c38e38a1b3f6ab13a53a648a97591f7b 100644 (file)
--- a/tools/snort2lua/config_states/config_ipv6_frag.cc
+++ b/tools/snort2lua/config_states/config_ipv6_frag.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace config
 {
@@ -48,7 +48,7 @@ void Ipv6Frag::add_deleted_option(std::string dlt_opt)
 {
     // see comment in Ipv6Frag::convert
     if (!ld->is_quiet_mode())
-        ld->add_deprecated_comment("config ipv6_frag: " + dlt_opt);
+        ld->add_deleted_comment("config ipv6_frag: " + dlt_opt);
 }
 
 bool Ipv6Frag::convert(std::istringstream& data_stream)

diff --git a/tools/snort2lua/config_states/config_memcaps.cc b/tools/snort2lua/config_states/config_memcaps.cc
index 65b68910a8cb5026225bf39d4eda0d5e738db7e8..622ee29a5573c82b9c7d3649ca1d806539f79b4c 100644 (file)
--- a/tools/snort2lua/config_states/config_memcaps.cc
+++ b/tools/snort2lua/config_states/config_memcaps.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace config
 {

diff --git a/tools/snort2lua/config_states/config_mpls_payload_type.cc b/tools/snort2lua/config_states/config_mpls_payload_type.cc
index a0d53f24ce4e4f336cd3b93b873b0bf5740c707e..65de78570cc87270befea2c07b6a40990042fbcc 100644 (file)
--- a/tools/snort2lua/config_states/config_mpls_payload_type.cc
+++ b/tools/snort2lua/config_states/config_mpls_payload_type.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace config
 {

diff --git a/tools/snort2lua/config_states/config_no_option.cc b/tools/snort2lua/config_states/config_no_option.cc
index ebbcd1521034e50a5b4c3785694d1da8f680b917..b4a21a1cdf779122a90f9fa237378d03bd2a0bc4 100644 (file)
--- a/tools/snort2lua/config_states/config_no_option.cc
+++ b/tools/snort2lua/config_states/config_no_option.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace config
 {

diff --git a/tools/snort2lua/config_states/config_one_int_option.cc b/tools/snort2lua/config_states/config_one_int_option.cc
index 55064d08301d0cbb605c3470772448993e7277c2..aaa29041bd0ec6016a3f6f46743cae22d2d8e1f9 100644 (file)
--- a/tools/snort2lua/config_states/config_one_int_option.cc
+++ b/tools/snort2lua/config_states/config_one_int_option.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace config
 {

diff --git a/tools/snort2lua/config_states/config_one_string_option.cc b/tools/snort2lua/config_states/config_one_string_option.cc
index fa18bc46a391a02a68535af43eeeb152eacd632d..fe193307e3032fbef409de8373e574eb5b91f3d1 100644 (file)
--- a/tools/snort2lua/config_states/config_one_string_option.cc
+++ b/tools/snort2lua/config_states/config_one_string_option.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace config
 {

diff --git a/tools/snort2lua/config_states/config_order.cc b/tools/snort2lua/config_states/config_order.cc
index 256350fbb1454a579150c14b6005dd6d05d7c4d0..5769f33fe7de16934f1e6cfe1f13610ba135956e 100644 (file)
--- a/tools/snort2lua/config_states/config_order.cc
+++ b/tools/snort2lua/config_states/config_order.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace config
 {

diff --git a/tools/snort2lua/config_states/config_ppm.cc b/tools/snort2lua/config_states/config_ppm.cc
index f1e967578044e5e81461e0ed832da0915737dcf7..1a7c7d722cc08ff31821c4999883e18549d99ae7 100644 (file)
--- a/tools/snort2lua/config_states/config_ppm.cc
+++ b/tools/snort2lua/config_states/config_ppm.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace config
 {

diff --git a/tools/snort2lua/config_states/config_profile.cc b/tools/snort2lua/config_states/config_profile.cc
index fac8c0610fd12ca3008e151a538cc32468bfda0c..258725319db9803853ea0609b627563ba0a9a7cb 100644 (file)
--- a/tools/snort2lua/config_states/config_profile.cc
+++ b/tools/snort2lua/config_states/config_profile.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace config
 {

diff --git a/tools/snort2lua/config_states/config_reference.cc b/tools/snort2lua/config_states/config_reference.cc
index bff84c0b8f38ab1c90136cb4bb0f6ba2d440ac7f..b8bcc09719c064e755a8b0607ce3ae4a9cd595d3 100644 (file)
--- a/tools/snort2lua/config_states/config_reference.cc
+++ b/tools/snort2lua/config_states/config_reference.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace config
 {

diff --git a/tools/snort2lua/config_states/config_response.cc b/tools/snort2lua/config_states/config_response.cc
index 1460e3e012d864c3e6caaf52a3f57e8d500014af..c5ca39d0a6131d163c3a4662c476a786a5010f7f 100644 (file)
--- a/tools/snort2lua/config_states/config_response.cc
+++ b/tools/snort2lua/config_states/config_response.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace config
 {

diff --git a/tools/snort2lua/config_states/config_tunnel_verdicts.cc b/tools/snort2lua/config_states/config_tunnel_verdicts.cc
index e8e41cc9c02b96691e20058e9c67a9614fffae52..7bba5d760764801e31b372ca7c6ff077146ba2b4 100644 (file)
--- a/tools/snort2lua/config_states/config_tunnel_verdicts.cc
+++ b/tools/snort2lua/config_states/config_tunnel_verdicts.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace config
 {

diff --git a/tools/snort2lua/conversion_state.h b/tools/snort2lua/conversion_state.h
index e3d7baa1af7dd9e1a2157728e8b8d522ff3ac5ff..9b46ea55074a2e9a48c31580c09d4485201abc70 100644 (file)
--- a/tools/snort2lua/conversion_state.h
+++ b/tools/snort2lua/conversion_state.h
@@ -30,9 +30,9 @@
 #include "data/dt_data.h"
 
 // the following three files are for the function 'set_next_rule_state'
-#include "util/util.h"
+#include "utils/snort2lua_util.h"
 #include "rule_states/rule_api.h"
-#include "util/converter.h"
+#include "utils/converter.h"
 
 class Converter;
 class ConversionState;
@@ -244,7 +244,7 @@ protected:
                                         bool required = true)
     {
         std::string val;
-        ld->add_deprecated_comment(opt_name);
+        ld->add_deleted_comment(opt_name);
 
         if(stream >> val)
             return true;

diff --git a/tools/snort2lua/data/Makefile.am b/tools/snort2lua/data/Makefile.am
new file mode 100644 (file)
index 0000000..08d411d
--- /dev/null
+++ b/tools/snort2lua/data/Makefile.am
@@ -0,0 +1,27 @@
+AUTOMAKE_OPTIONS=foreign no-dependencies
+
+
+noinst_LIBRARIES = libdata.a
+
+libdata_a_SOURCES = \
+dt_comment.h \
+dt_comment.cc \
+dt_data.h \
+dt_data.cc \
+dt_include.h \
+dt_include.cc \
+dt_option.h \
+dt_option.cc \
+dt_table.h \
+dt_table.cc \
+dt_rule.h \
+dt_rule.cc \
+dt_rule_option.h \
+dt_rule_option.cc \
+dt_rule_suboption.h \
+dt_rule_suboption.cc \
+dt_var.h \
+dt_var.cc
+
+
+AM_CXXFLAGS = @AM_CXXFLAGS@

diff --git a/tools/snort2lua/data/dt_comment.cc b/tools/snort2lua/data/dt_comment.cc
index 64956069cd51d24fbdddd271f807eb454922c5ac..b5bd61e2da19f1502b4e6646021ad290157874e4 100644 (file)
--- a/tools/snort2lua/data/dt_comment.cc
+++ b/tools/snort2lua/data/dt_comment.cc
@@ -20,7 +20,7 @@
 // dt_comment.cc author Josh Rosenbaum <jorosenba@cisco.com>
 
 #include "data/dt_comment.h"
-#include "util/util.h"
+#include "utils/snort2lua_util.h"
 
 Comments::Comments(CommentType type)
 {

diff --git a/tools/snort2lua/data/dt_data.cc b/tools/snort2lua/data/dt_data.cc
index 43c4b120ba89aa99c8b136fbc49bc5a427150a86..08cb145917834c3a1ee685875f5b0faa4d37f96b 100644 (file)
--- a/tools/snort2lua/data/dt_data.cc
+++ b/tools/snort2lua/data/dt_data.cc
@@ -20,7 +20,7 @@
 // dt_data.cc author Josh Rosenbaum <jorosenba@cisco.com>
 
 #include "dt_data.h"
-#include "util/util.h"
+#include "utils/snort2lua_util.h"
 #include <iostream>
 #include <sstream>
 
@@ -292,7 +292,7 @@ bool LuaData::add_diff_option_comment(std::string orig_var, std::string new_var)
 }
 
 
-bool LuaData::add_deprecated_comment(std::string dep_var)
+bool LuaData::add_deleted_comment(std::string dep_var)
 {
     std::string error_string = "option deleted: '" + dep_var + "'";
 

diff --git a/tools/snort2lua/data/dt_data.h b/tools/snort2lua/data/dt_data.h
index 20ccacec925ca30b8952d499ccf307c79a25b4c6..293ce6317eed89402b0d49923528ff9b067f3c87 100644 (file)
--- a/tools/snort2lua/data/dt_data.h
+++ b/tools/snort2lua/data/dt_data.h
@@ -111,7 +111,7 @@ public:
     // add a comment about an option change to the table
     bool add_diff_option_comment(std::string orig_var, std::string new_var);
     // attach a deprecated option comment to the current table
-    bool add_deprecated_comment(std::string dep_var);
+    bool add_deleted_comment(std::string dep_var);
     // attach an unsupported option comment to the current table
     bool add_unsupported_comment(std::string unsupported_var);
 

diff --git a/tools/snort2lua/data/dt_rule.cc b/tools/snort2lua/data/dt_rule.cc
index 72b113890737e9636cc7ce7382f57e5639a1236c..e0dee77bfd21f63155d167c09f9c4e02b97582e1 100644 (file)
--- a/tools/snort2lua/data/dt_rule.cc
+++ b/tools/snort2lua/data/dt_rule.cc
@@ -22,7 +22,7 @@
 
 #include "data/dt_rule.h"
 #include "data/dt_data.h"  // included for print mode
-#include "util/util.h"
+#include "utils/snort2lua_util.h"
 
 
 Rule::Rule() :  num_hdr_data(0),
@@ -31,7 +31,7 @@ Rule::Rule() :  num_hdr_data(0),
 {
 }
 
-Rule::~Rule(){};
+Rule::~Rule(){}
 
 
 bool Rule::add_hdr_data(std::string data)

diff --git a/tools/snort2lua/data/dt_var.cc b/tools/snort2lua/data/dt_var.cc
index 660c34af8c9f3350af7500c7911f176926ce444d..883ab6b7b0a35db511c38c7e5fdcf6cf1fc301ae 100644 (file)
--- a/tools/snort2lua/data/dt_var.cc
+++ b/tools/snort2lua/data/dt_var.cc
@@ -20,7 +20,7 @@
 // dt_var.cc author Josh Rosenbaum <jorosenba@cisco.com>
 
 #include "data/dt_var.h"
-#include "util/util.h"
+#include "utils/snort2lua_util.h"
 
 Variable::Variable(std::string name, int depth)
 {
@@ -34,7 +34,7 @@ Variable::Variable(std::string name)
     this->depth = 0;
 }
 
-Variable::~Variable(){};
+Variable::~Variable(){}
 
 // does this need a new variable?
 bool Variable::add_value(std::string elem)

diff --git a/tools/snort2lua/init_state.cc b/tools/snort2lua/init_state.cc
index b45fbd5fbe5e4b7111ce552b8ef7111157c213bc..372a972b5848fa015b312fd706018cbd3a904201 100644 (file)
--- a/tools/snort2lua/init_state.cc
+++ b/tools/snort2lua/init_state.cc
@@ -25,7 +25,7 @@
 #include <iostream>
 #include <string>
 #include "init_state.h"
-#include "util/util.h"
+#include "utils/snort2lua_util.h"
 #include "keyword_states/keywords_api.h"
 
 

diff --git a/tools/snort2lua/init_state.h b/tools/snort2lua/init_state.h
index 5bd8597335f6cdad53012b33b4e610e7941adc00..f5bb03ece67f6649df34077b376784238bba1861 100644 (file)
--- a/tools/snort2lua/init_state.h
+++ b/tools/snort2lua/init_state.h
@@ -22,7 +22,7 @@
 #include <sstream>
 #include <fstream>
 #include "conversion_state.h"
-#include "util/converter.h"
+#include "utils/converter.h"
 
 #ifndef INIT_STATE_H
 #define INIT_STATE_H

diff --git a/tools/snort2lua/keyword_states/Makefile.am b/tools/snort2lua/keyword_states/Makefile.am
new file mode 100644 (file)
index 0000000..515526c
--- /dev/null
+++ b/tools/snort2lua/keyword_states/Makefile.am
@@ -0,0 +1,22 @@
+AUTOMAKE_OPTIONS=foreign no-dependencies
+
+
+noinst_LIBRARIES = libkeyword_states.a
+
+libkeyword_states_a_SOURCES = \
+kws_config.cc \
+kws_event_filter.cc \
+kws_file.cc \
+kws_include.cc \
+kws_output.cc \
+kws_paths.cc \
+kws_preprocessor.cc \
+kws_rule.cc \
+kws_rule_state.cc \
+kws_rate_filter.cc \
+kws_var.cc \
+kws_suppress.cc \
+keywords_api.h \
+keywords_api.cc
+
+AM_CXXFLAGS = @AM_CXXFLAGS@

diff --git a/tools/snort2lua/keyword_states/kws_config.cc b/tools/snort2lua/keyword_states/kws_config.cc
index ed651b324a433b15fa8a4790afe1968f33b14b4f..e42d8ac88fd322f8e1eff6c393eeaf6bd2870077 100644 (file)
--- a/tools/snort2lua/keyword_states/kws_config.cc
+++ b/tools/snort2lua/keyword_states/kws_config.cc
@@ -23,9 +23,9 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
+#include "utils/converter.h"
 #include "config_states/config_api.h"
-#include "util/util.h"
+#include "utils/snort2lua_util.h"
 
 namespace keywords
 {

diff --git a/tools/snort2lua/keyword_states/kws_event_filter.cc b/tools/snort2lua/keyword_states/kws_event_filter.cc
index c6967405c796abd4b5f88da01a242c9d40c2976b..b42ad85ba173300c801490d84dfb1d17ccb9e50d 100644 (file)
--- a/tools/snort2lua/keyword_states/kws_event_filter.cc
+++ b/tools/snort2lua/keyword_states/kws_event_filter.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace keywords
 {

diff --git a/tools/snort2lua/keyword_states/kws_file.cc b/tools/snort2lua/keyword_states/kws_file.cc
index e49c3c9166ec8e32b9bdc826a3255c5808a3a748..de5d2aefaea9fc8db851f3641d6613a9639c0d1f 100644 (file)
--- a/tools/snort2lua/keyword_states/kws_file.cc
+++ b/tools/snort2lua/keyword_states/kws_file.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 
 namespace keywords

diff --git a/tools/snort2lua/keyword_states/kws_include.cc b/tools/snort2lua/keyword_states/kws_include.cc
index 6a309a3316d618ada965b8fe14944966b6715cbf..6e6f26c3c20afd554456fda13e98f8e85eb45469 100644 (file)
--- a/tools/snort2lua/keyword_states/kws_include.cc
+++ b/tools/snort2lua/keyword_states/kws_include.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace keywords
 {

diff --git a/tools/snort2lua/keyword_states/kws_output.cc b/tools/snort2lua/keyword_states/kws_output.cc
index ca103547b3b36e6d1a938f1127d719f7edd253bd..dd85542163e9703db1432bc78aa6bdf892f4fa01 100644 (file)
--- a/tools/snort2lua/keyword_states/kws_output.cc
+++ b/tools/snort2lua/keyword_states/kws_output.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 #include "output_states/output_api.h"
 
 namespace keywords

diff --git a/tools/snort2lua/keyword_states/kws_paths.cc b/tools/snort2lua/keyword_states/kws_paths.cc
index ae8ab69deb0ce51107c642ded806b78a5a60ff75..c06e2f96e230609d756bd774473508a2f18e5042 100644 (file)
--- a/tools/snort2lua/keyword_states/kws_paths.cc
+++ b/tools/snort2lua/keyword_states/kws_paths.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 
 namespace keywords

diff --git a/tools/snort2lua/keyword_states/kws_preprocessor.cc b/tools/snort2lua/keyword_states/kws_preprocessor.cc
index 1f53b86e5dc77e4d5fc14dd9e57894f4abb384ea..e96daf1e9e2e757b83b75738734ee2aac54b0acc 100644 (file)
--- a/tools/snort2lua/keyword_states/kws_preprocessor.cc
+++ b/tools/snort2lua/keyword_states/kws_preprocessor.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 #include "preprocessor_states/preprocessor_api.h"
 
 

diff --git a/tools/snort2lua/keyword_states/kws_rate_filter.cc b/tools/snort2lua/keyword_states/kws_rate_filter.cc
index 2f7d645c09225ea666d492a2c6f2272aa7273725..47333dbc43bd515d6ce2743948634a1135d39040 100644 (file)
--- a/tools/snort2lua/keyword_states/kws_rate_filter.cc
+++ b/tools/snort2lua/keyword_states/kws_rate_filter.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 
 namespace keywords

diff --git a/tools/snort2lua/keyword_states/kws_rule.cc b/tools/snort2lua/keyword_states/kws_rule.cc
index c4d09ed626b54878209068a71bdc98d1506cfbc8..39777ad5a202ab057ba35a86ce0b6b9910a137e3 100644 (file)
--- a/tools/snort2lua/keyword_states/kws_rule.cc
+++ b/tools/snort2lua/keyword_states/kws_rule.cc
@@ -24,8 +24,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 #include "rule_states/rule_api.h"
 
 

diff --git a/tools/snort2lua/keyword_states/kws_rule_state.cc b/tools/snort2lua/keyword_states/kws_rule_state.cc
index 622b16b2d4ce937e3bfd79a4926baf27040969c7..e93c6fd2e891660063f9434ae1abf3f1ba1bc5cb 100644 (file)
--- a/tools/snort2lua/keyword_states/kws_rule_state.cc
+++ b/tools/snort2lua/keyword_states/kws_rule_state.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace keywords
 {
@@ -83,7 +83,7 @@ bool RuleState::convert(std::istringstream& data_stream)
                 count++;
                 break;
             case 3:
-                ld->add_deprecated_comment("action");
+                ld->add_deleted_comment("action");
                 count++;
                 break;
             default:

diff --git a/tools/snort2lua/keyword_states/kws_ruletype.cc b/tools/snort2lua/keyword_states/kws_ruletype.cc
index 049fba1b16b5d819f25dc2b099efd0178d704226..f4de42dcf895bcc1932f639bb766f90e190243a1 100644 (file)
--- a/tools/snort2lua/keyword_states/kws_ruletype.cc
+++ b/tools/snort2lua/keyword_states/kws_ruletype.cc
@@ -23,7 +23,7 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
+#include "utils/converter.h"
 #include "config_states/config_api.h"
 
 

diff --git a/tools/snort2lua/keyword_states/kws_suppress.cc b/tools/snort2lua/keyword_states/kws_suppress.cc
index 6fe019652d03b3f0dee7a69f970425f702153785..226d838110a1b4a216e23f287a874464fd983c3d 100644 (file)
--- a/tools/snort2lua/keyword_states/kws_suppress.cc
+++ b/tools/snort2lua/keyword_states/kws_suppress.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 
 namespace keywords

diff --git a/tools/snort2lua/keyword_states/kws_var.cc b/tools/snort2lua/keyword_states/kws_var.cc
index 2316a29b206bcf07f39ae0fec03aaa6b7a40ecb3..b19903a766040be42240554274cf6a6e475a9e4f 100644 (file)
--- a/tools/snort2lua/keyword_states/kws_var.cc
+++ b/tools/snort2lua/keyword_states/kws_var.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 
 namespace keywords

diff --git a/tools/snort2lua/output_states/Makefile.am b/tools/snort2lua/output_states/Makefile.am
new file mode 100644 (file)
index 0000000..f44b3e8
--- /dev/null
+++ b/tools/snort2lua/output_states/Makefile.am
@@ -0,0 +1,21 @@
+AUTOMAKE_OPTIONS=foreign no-dependencies
+
+
+noinst_LIBRARIES = liboutput_states.a
+
+liboutput_states_a_SOURCES = \
+out_csv.cc \
+out_fast.cc \
+out_full.cc \
+out_null.cc \
+out_tcpdump.cc \
+out_test.cc \
+out_syslog.cc \
+out_unified2.cc \
+out_unixsock.cc \
+output_api.h \
+output_api.cc
+
+
+AM_CXXFLAGS = @AM_CXXFLAGS@
+

diff --git a/tools/snort2lua/output_states/out_csv.cc b/tools/snort2lua/output_states/out_csv.cc
index b405679570287c71f24a33ba33be43fa78462fd2..1a7d9ba45a8820ab26f97a304e831eae99489e00 100644 (file)
--- a/tools/snort2lua/output_states/out_csv.cc
+++ b/tools/snort2lua/output_states/out_csv.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace output
 {
@@ -70,7 +70,7 @@ bool AlertCsv::convert(std::istringstream& data_stream)
         std::string new_val = std::string();
 
         if (!val.compare("default"))
-            ld->add_deprecated_comment("default");
+            ld->add_deleted_comment("default");
 
         else if (!val.compare("timestamp"))
             new_val = "timestamp";

diff --git a/tools/snort2lua/output_states/out_fast.cc b/tools/snort2lua/output_states/out_fast.cc
index 0ddcdfb31a6c52ac49c3f1223c8cc72921722df1..c28cb2c818c869ff4a6f05fd52777fa8cea32964 100644 (file)
--- a/tools/snort2lua/output_states/out_fast.cc
+++ b/tools/snort2lua/output_states/out_fast.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace output
 {

diff --git a/tools/snort2lua/output_states/out_full.cc b/tools/snort2lua/output_states/out_full.cc
index bab6ccf08ebba23e0a821323de7e30b999e536a7..fe4b81672b78fc93dd592ae691b36c8ac596e3a8 100644 (file)
--- a/tools/snort2lua/output_states/out_full.cc
+++ b/tools/snort2lua/output_states/out_full.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace output
 {

diff --git a/tools/snort2lua/output_states/out_null.cc b/tools/snort2lua/output_states/out_null.cc
index a5d0f25c67dae60ae4c7bdc740a3d4eacb2361d8..5475f16e85294bd8b5264958d73ab1330e6e295b 100644 (file)
--- a/tools/snort2lua/output_states/out_null.cc
+++ b/tools/snort2lua/output_states/out_null.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace output
 {

diff --git a/tools/snort2lua/output_states/out_syslog.cc b/tools/snort2lua/output_states/out_syslog.cc
index 11d96df0cb11b7687f1593395a08d474a943a299..8fed39720b9e6cf390072d6961a8d29cc9aa105a 100644 (file)
--- a/tools/snort2lua/output_states/out_syslog.cc
+++ b/tools/snort2lua/output_states/out_syslog.cc
@@ -23,9 +23,9 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
+#include "utils/converter.h"
 #include "rule_states/rule_api.h"
-#include "util/util.h"
+#include "utils/snort2lua_util.h"
 
 namespace output
 {

diff --git a/tools/snort2lua/output_states/out_tcpdump.cc b/tools/snort2lua/output_states/out_tcpdump.cc
index e8b604762569d0443ba10fdfdf6a0db39012514d..7883bfd5e98c0a74c5efc7a1f136917abfc1c0b8 100644 (file)
--- a/tools/snort2lua/output_states/out_tcpdump.cc
+++ b/tools/snort2lua/output_states/out_tcpdump.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace output
 {

diff --git a/tools/snort2lua/output_states/out_test.cc b/tools/snort2lua/output_states/out_test.cc
index 034489f430440f8f0a6db5fb9d20ae9b9695593c..bd9ec14b9e66f8e184e8a78b054a33539968685e 100644 (file)
--- a/tools/snort2lua/output_states/out_test.cc
+++ b/tools/snort2lua/output_states/out_test.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace output
 {

diff --git a/tools/snort2lua/output_states/out_unified2.cc b/tools/snort2lua/output_states/out_unified2.cc
index 8e08b32c126f84ca0402525971add9798073dbfa..11f3ffd43ea81d1d2b60e7808255224a0b678d1c 100644 (file)
--- a/tools/snort2lua/output_states/out_unified2.cc
+++ b/tools/snort2lua/output_states/out_unified2.cc
@@ -23,9 +23,9 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
+#include "utils/converter.h"
 #include "rule_states/rule_api.h"
-#include "util/util.h"
+#include "utils/snort2lua_util.h"
 
 namespace output
 {

diff --git a/tools/snort2lua/output_states/out_unixsock.cc b/tools/snort2lua/output_states/out_unixsock.cc
index 89ce62086638ad34f6f80d199a4e5506b85fc1ab..08290abad2b02e469527a6457b9a308fa5e6def1 100644 (file)
--- a/tools/snort2lua/output_states/out_unixsock.cc
+++ b/tools/snort2lua/output_states/out_unixsock.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace output
 {

diff --git a/tools/snort2lua/preprocessor_states/Makefile.am b/tools/snort2lua/preprocessor_states/Makefile.am
new file mode 100644 (file)
index 0000000..f4738f1
--- /dev/null
+++ b/tools/snort2lua/preprocessor_states/Makefile.am
@@ -0,0 +1,27 @@
+AUTOMAKE_OPTIONS=foreign no-dependencies
+
+
+noinst_LIBRARIES = libpreprocessor_states.a
+
+libpreprocessor_states_a_SOURCES = \
+pps_arpspoof.cc \
+pps_bo.cc \
+pps_frag3_engine.cc \
+pps_frag3_global.cc \
+pps_ftp_telnet.cc \
+pps_ftp_telnet_protocol.cc \
+pps_gtp.cc \
+pps_http_inspect.cc \
+pps_http_inspect_server.cc \
+pps_normalizers.cc \
+pps_perfmonitor.cc \
+pps_rpc_decode.cc \
+pps_sfportscan.cc \
+pps_stream_ip.cc \
+pps_stream_global.cc \
+pps_stream_tcp.cc \
+pps_stream_udp.cc \
+preprocessor_api.h \
+preprocessor_api.cc
+
+AM_CXXFLAGS = @AM_CXXFLAGS@

diff --git a/tools/snort2lua/preprocessor_states/pps_arpspoof.cc b/tools/snort2lua/preprocessor_states/pps_arpspoof.cc
index 93f1c5c2c39986999d4ea1ff1d887a665ec79ba3..2b671abaa7314349b507b39c61b2b3ec276a6b76 100644 (file)
--- a/tools/snort2lua/preprocessor_states/pps_arpspoof.cc
+++ b/tools/snort2lua/preprocessor_states/pps_arpspoof.cc
@@ -22,8 +22,8 @@
 #include <sstream>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace preprocessors
 {

diff --git a/tools/snort2lua/preprocessor_states/pps_bo.cc b/tools/snort2lua/preprocessor_states/pps_bo.cc
index 2dcc222cf127194fcda3d107da5f63271417efd1..d612b8d0ec4d57bddb7235f6a320be046c92b9bf 100644 (file)
--- a/tools/snort2lua/preprocessor_states/pps_bo.cc
+++ b/tools/snort2lua/preprocessor_states/pps_bo.cc
@@ -24,8 +24,8 @@
 #include <iomanip>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 
 namespace preprocessors

diff --git a/tools/snort2lua/preprocessor_states/pps_frag3_engine.cc b/tools/snort2lua/preprocessor_states/pps_frag3_engine.cc
index 1270986f0c603453332bfb9b7f41b225259ea59d..e240eaccb43cd462779f4bc990c14641ec0821fd 100644 (file)
--- a/tools/snort2lua/preprocessor_states/pps_frag3_engine.cc
+++ b/tools/snort2lua/preprocessor_states/pps_frag3_engine.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace preprocessors
 {
@@ -93,7 +93,7 @@ bool Frag3Engine::convert(std::istringstream& data_stream)
             tmpval = parse_string_option("policy", data_stream);
 
         else if(!keyword.compare("detect_anomalies"))
-            ld->add_deprecated_comment("detect_anomalies");
+            ld->add_deleted_comment("detect_anomalies");
 
         else if(!keyword.compare("bind_to"))
             parse_ip_list("bind_to", data_stream);

diff --git a/tools/snort2lua/preprocessor_states/pps_frag3_global.cc b/tools/snort2lua/preprocessor_states/pps_frag3_global.cc
index e012664a373ec6de04f08788d0229a616e655cb5..c706e960882901baf87096fda17b4b108334f956 100644 (file)
--- a/tools/snort2lua/preprocessor_states/pps_frag3_global.cc
+++ b/tools/snort2lua/preprocessor_states/pps_frag3_global.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace preprocessors
 {
@@ -60,7 +60,7 @@ bool Frag3Global::convert(std::istringstream& data_stream)
         args_stream >> keyword;
         
         if(!keyword.compare("disabled"))
-            ld->add_deprecated_comment("disabled");
+            ld->add_deleted_comment("disabled");
 
         else if(!keyword.compare("max_frags"))
             tmpval = parse_int_option("max_frags", args_stream);

diff --git a/tools/snort2lua/preprocessor_states/pps_ftp_telnet.cc b/tools/snort2lua/preprocessor_states/pps_ftp_telnet.cc
index 2e97a33b454873bb83f85c317c998558f5f3022a..d477c954a9ac1b06963063f5ee38104f602d9e3b 100644 (file)
--- a/tools/snort2lua/preprocessor_states/pps_ftp_telnet.cc
+++ b/tools/snort2lua/preprocessor_states/pps_ftp_telnet.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace preprocessors
 {
@@ -63,10 +63,10 @@ void FtpTelnet::add_ftp_n_telnet_deprecated(std::istringstream& data_stream,
     std::string tmp;
     data_stream >> tmp;  // eat the next word
     ld->open_table("telnet");
-    ld->add_deprecated_comment(opt_name);
+    ld->add_deleted_comment(opt_name);
     ld->close_table();
     ld->open_table("ftp_server");
-    ld->add_deprecated_comment(opt_name);
+    ld->add_deleted_comment(opt_name);
     ld->close_table();
 }
 
@@ -84,7 +84,7 @@ bool FtpTelnet::convert(std::istringstream& data_stream)
     {
         if(keyword.compare("global"))
         {
-            cv->log_error("preprocessor ftp_telnet: requires the 'global' keyword");
+            ld->add_error_comment("preprocessor ftp_telnet: requires the 'global' keyword");
             return false;
         }
     }

diff --git a/tools/snort2lua/preprocessor_states/pps_ftp_telnet_protocol.cc b/tools/snort2lua/preprocessor_states/pps_ftp_telnet_protocol.cc
index a553afceafc9dcfc049f36e5671d9095e3987d98..f8af5c35421239ba5ea9f6dd8a21eb777e73db5b 100644 (file)
--- a/tools/snort2lua/preprocessor_states/pps_ftp_telnet_protocol.cc
+++ b/tools/snort2lua/preprocessor_states/pps_ftp_telnet_protocol.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace preprocessors
 {

diff --git a/tools/snort2lua/preprocessor_states/pps_gtp.cc b/tools/snort2lua/preprocessor_states/pps_gtp.cc
index fad2f0c89aec7f060f2f49165d4d9a1b1467bfe6..9d9c41bd3ea6a83c71b69489e66b4d9905bb747f 100644 (file)
--- a/tools/snort2lua/preprocessor_states/pps_gtp.cc
+++ b/tools/snort2lua/preprocessor_states/pps_gtp.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace preprocessors
 {

diff --git a/tools/snort2lua/preprocessor_states/pps_http_inspect.cc b/tools/snort2lua/preprocessor_states/pps_http_inspect.cc
index 89755446432fd916765ad78a3edf389fb83114c2..e2bab87c683af24ec8fe560563ce9138e6d38f5e 100644 (file)
--- a/tools/snort2lua/preprocessor_states/pps_http_inspect.cc
+++ b/tools/snort2lua/preprocessor_states/pps_http_inspect.cc
@@ -24,8 +24,8 @@
 #include <string>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace preprocessors
 {
@@ -61,7 +61,7 @@ bool HttpInspect::convert(std::istringstream& data_stream)
     {
         if(keyword.compare("global"))
         {
-            cv->log_error("preprocessor httpinspect: requires the 'global' keyword");
+            ld->add_error_comment("preprocessor httpinspect: requires the 'global' keyword");
             return false;
         }
     }
@@ -95,7 +95,7 @@ bool HttpInspect::convert(std::istringstream& data_stream)
             tmpval = parse_int_option("chunk_length", data_stream);
         
         else if(!keyword.compare("disabled"))
-            ld->add_deprecated_comment("disabled");
+            ld->add_deleted_comment("disabled");
 
         else if(!keyword.compare("b64_decode_depth"))
             tmpval = add_decode_option("b64_decode_depth", data_stream);

diff --git a/tools/snort2lua/preprocessor_states/pps_http_inspect_server.cc b/tools/snort2lua/preprocessor_states/pps_http_inspect_server.cc
index 239b180d6ac024ca3bd8f58fa45083c35b0abedd..8e8eeccb208f3155a8028e8fb98b95e0ae19d842 100644 (file)
--- a/tools/snort2lua/preprocessor_states/pps_http_inspect_server.cc
+++ b/tools/snort2lua/preprocessor_states/pps_http_inspect_server.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace preprocessors
 {
@@ -214,7 +214,7 @@ bool HttpInspectServer::convert(std::istringstream& data_stream)
             tmpval = parse_int_option("max_headers", data_stream);
 
         else if (!keyword.compare("no_alerts"))
-            ld->add_deprecated_comment("no_alerts");
+            ld->add_deleted_comment("no_alerts");
 
         else if (!keyword.compare("decompress_swf"))
             tmpval = parse_bracketed_unsupported_list("decompress_swf", data_stream);

diff --git a/tools/snort2lua/preprocessor_states/pps_normalizers.cc b/tools/snort2lua/preprocessor_states/pps_normalizers.cc
index 580af8807e58f01e1a25e8f5b6d7074cdb8a71d4..3ca14390499c7c0b84ec378f12a8e8cfb7f3a95b 100644 (file)
--- a/tools/snort2lua/preprocessor_states/pps_normalizers.cc
+++ b/tools/snort2lua/preprocessor_states/pps_normalizers.cc
@@ -24,8 +24,8 @@
 #include <iomanip>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace preprocessors
 {

diff --git a/tools/snort2lua/preprocessor_states/pps_perfmonitor.cc b/tools/snort2lua/preprocessor_states/pps_perfmonitor.cc
index f6f0118f32f29c7bdf0a11271be9948c5981d44b..ae091fa2f71a2c6267bb2070e52c8968721b54b7 100644 (file)
--- a/tools/snort2lua/preprocessor_states/pps_perfmonitor.cc
+++ b/tools/snort2lua/preprocessor_states/pps_perfmonitor.cc
@@ -24,8 +24,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace preprocessors
 {
@@ -91,19 +91,19 @@ bool PerfMonitor::convert(std::istringstream& data_stream)
             tmpval = ld->add_option_to_table("reset", true);
 
         else if (!keyword.compare("atexitonly"))
-            ld->add_deprecated_comment("atexitonly");
+            ld->add_deleted_comment("atexitonly");
 
         else if (!keyword.compare("base-stats"))
-            ld->add_deprecated_comment("atexitonly: base-stats");
+            ld->add_deleted_comment("atexitonly: base-stats");
 
         else if (!keyword.compare("flow-stats"))
-            ld->add_deprecated_comment("atexitonly: flow-stats");
+            ld->add_deleted_comment("atexitonly: flow-stats");
 
         else if (!keyword.compare("flow-ip-stats"))
-            ld->add_deprecated_comment("atexitonly: flow-ip-stats");
+            ld->add_deleted_comment("atexitonly: flow-ip-stats");
 
         else if (!keyword.compare("events-stats"))
-            ld->add_deprecated_comment("atexitonly: events-stats");
+            ld->add_deleted_comment("atexitonly: events-stats");
 
         else if (!keyword.compare("max_file_size"))
             tmpval = parse_int_option("max_file_size", data_stream);

diff --git a/tools/snort2lua/preprocessor_states/pps_rpc_decode.cc b/tools/snort2lua/preprocessor_states/pps_rpc_decode.cc
index a484ecfb14b3617c8d46c90207ce23d38d6de15f..dc0bee07cbef54ecd3be637f53462a443d63618b 100644 (file)
--- a/tools/snort2lua/preprocessor_states/pps_rpc_decode.cc
+++ b/tools/snort2lua/preprocessor_states/pps_rpc_decode.cc
@@ -24,8 +24,8 @@
 #include <string>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace preprocessors
 {
@@ -56,16 +56,16 @@ bool RpcDecode::convert(std::istringstream& data_stream)
         bool tmpval = true;
 
         if(!keyword.compare("no_alert_multiple_requests"))
-            ld->add_deprecated_comment("no_alert_multiple_requests");
+            ld->add_deleted_comment("no_alert_multiple_requests");
 
         else if(!keyword.compare("alert_fragments"))
-            ld->add_deprecated_comment("alert_fragments");
+            ld->add_deleted_comment("alert_fragments");
 
         else if(!keyword.compare("no_alert_large_fragments"))
-            ld->add_deprecated_comment("no_alert_large_fragments");
+            ld->add_deleted_comment("no_alert_large_fragments");
 
         else if(!keyword.compare("no_alert_incomplete"))
-            ld->add_deprecated_comment("no_alert_incomplete");
+            ld->add_deleted_comment("no_alert_incomplete");
 
         else if (isdigit(keyword[0]))
             port_list += ' ' + keyword;

diff --git a/tools/snort2lua/preprocessor_states/pps_sfportscan.cc b/tools/snort2lua/preprocessor_states/pps_sfportscan.cc
index b5532eb168bd9bd82cddd345b294283da18db5ef..f9347202ec33b8d695f3044f8c81feed89c09fa1 100644 (file)
--- a/tools/snort2lua/preprocessor_states/pps_sfportscan.cc
+++ b/tools/snort2lua/preprocessor_states/pps_sfportscan.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace preprocessors
 {
@@ -148,16 +148,16 @@ bool PortScan::convert(std::istringstream& data_stream)
             tmpval = ld->add_option_to_table("include_midstream", true);
 
         else if(!keyword.compare("disabled"))
-            ld->add_deprecated_comment("disabled");
+            ld->add_deleted_comment("disabled");
 
         else if(!keyword.compare("detect_ack_scans"))
-            ld->add_deprecated_comment("detect_ack_scans");
+            ld->add_deleted_comment("detect_ack_scans");
 
         else if(!keyword.compare("logfile"))
         {
             if (!util::get_string(data_stream, keyword, "}"))
                 tmpval = false;
-            ld->add_deprecated_comment("logfile");
+            ld->add_deleted_comment("logfile");
         }
 
         else if(!keyword.compare("memcap"))

diff --git a/tools/snort2lua/preprocessor_states/pps_stream_global.cc b/tools/snort2lua/preprocessor_states/pps_stream_global.cc
index 8985e597398ce2af380281be03a031f9ddf505a5..385a917a313021c7633643b74a9f0803909d9588 100644 (file)
--- a/tools/snort2lua/preprocessor_states/pps_stream_global.cc
+++ b/tools/snort2lua/preprocessor_states/pps_stream_global.cc
@@ -24,8 +24,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace preprocessors
 {
@@ -60,16 +60,16 @@ bool StreamGlobal::convert(std::istringstream& data_stream)
             tmpval = false;
 
         else if (!keyword.compare("flush_on_alert"))
-            ld->add_deprecated_comment("flush_on_alert");
+            ld->add_deleted_comment("flush_on_alert");
 
         else if (!keyword.compare("disabled"))
-            ld->add_deprecated_comment("disabled");
+            ld->add_deleted_comment("disabled");
 
         else if (!keyword.compare("enable_ha"))
             ld->add_unsupported_comment("enable_ha");
 
         else if (!keyword.compare("no_midstream_drop_alerts"))
-            ld->add_deprecated_comment("no_midstream_drop_alerts");
+            ld->add_deleted_comment("no_midstream_drop_alerts");
 
         else if (!keyword.compare("track_tcp"))
             tmpval = parse_deleted_option("track_tcp", arg_stream);

diff --git a/tools/snort2lua/preprocessor_states/pps_stream_ip.cc b/tools/snort2lua/preprocessor_states/pps_stream_ip.cc
index dbfe53e7862a6caacb1443225778aec66d690713..a70cabbd60ad2ac8e653b8af63cc6b87914c0393 100644 (file)
--- a/tools/snort2lua/preprocessor_states/pps_stream_ip.cc
+++ b/tools/snort2lua/preprocessor_states/pps_stream_ip.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace preprocessors
 {

diff --git a/tools/snort2lua/preprocessor_states/pps_stream_tcp.cc b/tools/snort2lua/preprocessor_states/pps_stream_tcp.cc
index 137f480a4bf5efe21171a67a11aa4200cc6b827a..3c677a89a652fdbcf47749808f4320874f1785e4 100644 (file)
--- a/tools/snort2lua/preprocessor_states/pps_stream_tcp.cc
+++ b/tools/snort2lua/preprocessor_states/pps_stream_tcp.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace preprocessors
 {
@@ -199,13 +199,13 @@ bool StreamTcp::convert(std::istringstream& data_stream)
             tmpval = parse_ports(arg_stream);
 
         else if (!keyword.compare("detect_anomalies"))
-            ld->add_deprecated_comment("detect_anomalies");
+            ld->add_deleted_comment("detect_anomalies");
 
         else if (!keyword.compare("dont_store_large_packets"))
-            ld->add_deprecated_comment("dont_store_large_packets");
+            ld->add_deleted_comment("dont_store_large_packets");
 
         else if (!keyword.compare("check_session_hijacking"))
-            ld->add_deprecated_comment("check_session_hijacking");
+            ld->add_deleted_comment("check_session_hijacking");
 
         else if (!keyword.compare("flush_factor"))
             tmpval = parse_int_option("flush_factor", arg_stream);

diff --git a/tools/snort2lua/preprocessor_states/pps_stream_udp.cc b/tools/snort2lua/preprocessor_states/pps_stream_udp.cc
index fc626b20522a43f34cd709bba7826c3a93cc065c..f1fca9d4f7ec53dc75ec35ea0dc83b8d80d6b8e0 100644 (file)
--- a/tools/snort2lua/preprocessor_states/pps_stream_udp.cc
+++ b/tools/snort2lua/preprocessor_states/pps_stream_udp.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace preprocessors
 {

diff --git a/tools/snort2lua/rule_states/Makefile.am b/tools/snort2lua/rule_states/Makefile.am
new file mode 100644 (file)
index 0000000..b675de3
--- /dev/null
+++ b/tools/snort2lua/rule_states/Makefile.am
@@ -0,0 +1,18 @@
+AUTOMAKE_OPTIONS=foreign no-dependencies
+
+
+noinst_LIBRARIES = librule_states.a
+
+librule_states_a_SOURCES = \
+rule_base64_decode.cc \
+rule_content.cc \
+rule_file_data.cc \
+rule_http_encode.cc \
+rule_metadata.cc \
+rule_pcre.cc \
+rule_unchanged.cc \
+rule_urilen.cc \
+rule_api.cc \
+rule_api.h
+
+AM_CXXFLAGS = @AM_CXXFLAGS@

diff --git a/tools/snort2lua/rule_states/rule_api.cc b/tools/snort2lua/rule_states/rule_api.cc
index 3a6fc98663eed98fa8b5b3588e78b85d64e3194c..dcc2c4dad71e66fc2d377c5e9c80e9e0ff979cdb 100644 (file)
--- a/tools/snort2lua/rule_states/rule_api.cc
+++ b/tools/snort2lua/rule_states/rule_api.cc
@@ -21,8 +21,8 @@
 
 #include <string>
 #include "rule_states/rule_api.h"
-#include "util/util.h"
-#include "util/converter.h"
+#include "utils/snort2lua_util.h"
+#include "utils/converter.h"
 
 namespace rules
 {

diff --git a/tools/snort2lua/rule_states/rule_base64_decode.cc b/tools/snort2lua/rule_states/rule_base64_decode.cc
index 9123d7b88e78b28d7082b8893f925ebf1564ec22..6d3909af2b471f921488b79d6eb4fada6499f1ac 100644 (file)
--- a/tools/snort2lua/rule_states/rule_base64_decode.cc
+++ b/tools/snort2lua/rule_states/rule_base64_decode.cc
@@ -23,9 +23,9 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
+#include "utils/converter.h"
 #include "rule_states/rule_api.h"
-#include "util/util.h"
+#include "utils/snort2lua_util.h"
 
 namespace rules
 {

diff --git a/tools/snort2lua/rule_states/rule_content.cc b/tools/snort2lua/rule_states/rule_content.cc
index f5a3db11fbdf53b974ea21ad143054b7d3375497..2bd45c9e046187e51950ae57574ffec4554adb73 100644 (file)
--- a/tools/snort2lua/rule_states/rule_content.cc
+++ b/tools/snort2lua/rule_states/rule_content.cc
@@ -23,9 +23,9 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
+#include "utils/converter.h"
 #include "rule_states/rule_api.h"
-#include "util/util.h"
+#include "utils/snort2lua_util.h"
 
 namespace rules
 {

diff --git a/tools/snort2lua/rule_states/rule_file_data.cc b/tools/snort2lua/rule_states/rule_file_data.cc
index d9d548cc2cbb53b3caaa8d0154ad36af438214bc..573fec3dc39bc05dc44417bf6c36a73589bf7303 100644 (file)
--- a/tools/snort2lua/rule_states/rule_file_data.cc
+++ b/tools/snort2lua/rule_states/rule_file_data.cc
@@ -23,9 +23,9 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
+#include "utils/converter.h"
 #include "rule_states/rule_api.h"
-#include "util/util.h"
+#include "utils/snort2lua_util.h"
 
 namespace rules
 {

diff --git a/tools/snort2lua/rule_states/rule_http_encode.cc b/tools/snort2lua/rule_states/rule_http_encode.cc
index 8acb9c72db3e968f7919625a494b1fb70469de9d..b4f3e85edc8e7246b194ac96a5e618ce4a71c619 100644 (file)
--- a/tools/snort2lua/rule_states/rule_http_encode.cc
+++ b/tools/snort2lua/rule_states/rule_http_encode.cc
@@ -23,9 +23,9 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
+#include "utils/converter.h"
 #include "rule_states/rule_api.h"
-#include "util/util.h"
+#include "utils/snort2lua_util.h"
 
 namespace rules
 {

diff --git a/tools/snort2lua/rule_states/rule_metadata.cc b/tools/snort2lua/rule_states/rule_metadata.cc
index 21655484ca29b52b8f035d86851eab333ad297d3..911c965eff55d98f2e42efde311d7fea8da2f0d2 100644 (file)
--- a/tools/snort2lua/rule_states/rule_metadata.cc
+++ b/tools/snort2lua/rule_states/rule_metadata.cc
@@ -23,9 +23,9 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
+#include "utils/converter.h"
 #include "rule_states/rule_api.h"
-#include "util/util.h"
+#include "utils/snort2lua_util.h"
 
 namespace rules
 {

diff --git a/tools/snort2lua/rule_states/rule_pcre.cc b/tools/snort2lua/rule_states/rule_pcre.cc
index 2a04c97d9179ed2c10553476243f7156eeb68cce..760753b906090951ee9691321a5d707d656e2e09 100644 (file)
--- a/tools/snort2lua/rule_states/rule_pcre.cc
+++ b/tools/snort2lua/rule_states/rule_pcre.cc
@@ -24,9 +24,9 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
+#include "utils/converter.h"
 #include "rule_states/rule_api.h"
-#include "util/util.h"
+#include "utils/snort2lua_util.h"
 
 namespace rules
 {

diff --git a/tools/snort2lua/rule_states/rule_unchanged.cc b/tools/snort2lua/rule_states/rule_unchanged.cc
index d783e9535ce19ee7c809e980c8e339aa8ef17cc9..25e0ca4f68790b3910538b46d63c26c1c9c9d632 100644 (file)
--- a/tools/snort2lua/rule_states/rule_unchanged.cc
+++ b/tools/snort2lua/rule_states/rule_unchanged.cc
@@ -23,9 +23,9 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
+#include "utils/converter.h"
 #include "rule_states/rule_api.h"
-#include "util/util.h"
+#include "utils/snort2lua_util.h"
 
 namespace rules
 {

diff --git a/tools/snort2lua/rule_states/rule_urilen.cc b/tools/snort2lua/rule_states/rule_urilen.cc
index 79713f8c5055cff98096188e72c8a9671b25ce39..8ac536139911fe6d53870f58956a8773b6aa1ea6 100644 (file)
--- a/tools/snort2lua/rule_states/rule_urilen.cc
+++ b/tools/snort2lua/rule_states/rule_urilen.cc
@@ -23,9 +23,9 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
+#include "utils/converter.h"
 #include "rule_states/rule_api.h"
-#include "util/util.h"
+#include "utils/snort2lua_util.h"
 
 namespace rules
 {

diff --git a/tools/snort2lua/snort2lua.cc b/tools/snort2lua/snort2lua.cc
index 1ef2b83b622825b48821634659d6aa22313add50..e1cfa8b2012b84357eb91e0e6de457e9f8e2bc00 100644 (file)
--- a/tools/snort2lua/snort2lua.cc
+++ b/tools/snort2lua/snort2lua.cc
@@ -22,9 +22,9 @@
 #include <iostream>
 #include <fstream>
 
-#include "util/converter.h"
+#include "utils/converter.h"
 #include "init_state.h"
-#include "util/util.h"
+#include "utils/snort2lua_util.h"
 #include "option_parser.h"
 
 

diff --git a/tools/snort2lua/util/CMakeLists.txt b/tools/snort2lua/util/CMakeLists.txt
deleted file mode 100644 (file)
index e1fb438..0000000
--- a/tools/snort2lua/util/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-add_library( util
-    converter.h
-    converter.cc
-    util.h
-    util.cc
-)
-
-target_link_libraries( util
-    conversion_data
-)

diff --git a/tools/snort2lua/utils/CMakeLists.txt b/tools/snort2lua/utils/CMakeLists.txt
new file mode 100644 (file)
index 0000000..30854b1
--- /dev/null
+++ b/tools/snort2lua/utils/CMakeLists.txt
@@ -0,0 +1,12 @@
+
+
+add_library( snort2lua_utils
+    converter.h
+    converter.cc
+    snort2lua_util.h
+    snort2lua_util.cc
+)
+
+target_link_libraries( snort2lua_utils
+    conversion_data
+)

diff --git a/tools/snort2lua/utils/Makefile.am b/tools/snort2lua/utils/Makefile.am
new file mode 100644 (file)
index 0000000..730e9db
--- /dev/null
+++ b/tools/snort2lua/utils/Makefile.am
@@ -0,0 +1,12 @@
+AUTOMAKE_OPTIONS=foreign no-dependencies
+
+
+noinst_LIBRARIES = libsnort2lua_utils.a
+
+libsnort2lua_utils_a_SOURCES = \
+converter.h \
+converter.cc \
+snort2lua_util.h \
+snort2lua_util.cc
+
+AM_CXXFLAGS = @AM_CXXFLAGS@

diff --git a/tools/snort2lua/util/converter.cc b/tools/snort2lua/utils/converter.cc
similarity index 82%
rename from tools/snort2lua/util/converter.cc
rename to tools/snort2lua/utils/converter.cc
index 6ddd77e125472561f0e85e771b8abd52962e590f..da85e5c0ff87174693128f1700cdc2247e227a26 100644 (file)
--- a/tools/snort2lua/util/converter.cc
+++ b/tools/snort2lua/utils/converter.cc
@@ -20,9 +20,9 @@
 // converter.cc author Josh Rosenbaum <jorosenba@cisco.com>
 
 #include <iostream>
-#include "util/converter.h"
+#include "utils/converter.h"
 #include "conversion_state.h"
-#include "util/util.h"
+#include "utils/snort2lua_util.h"
 #include "data/dt_comment.h"
 
 
@@ -184,11 +184,11 @@ int Converter::convert_file(std::string input_file)
         {
             orig_text += tmp;
             std::istringstream data_stream(orig_text);
-            while(data_stream.peek() != std::char_traits<wchar_t>::eof())
+            while(data_stream.peek() != EOF)
             {
                 if ((state == nullptr) || !state->convert(data_stream))
                 {
-                    log_error("Failed to entirely convert: " + orig_text);
+                    ld->add_error_comment("Failed to entirely convert: " + orig_text);
                     break;
                 }
             }
@@ -201,48 +201,3 @@ int Converter::convert_file(std::string input_file)
     // this is set by parse_include_file
     return error ? -3 : 0;
 }
-
-/*******************************
- *******  PRINTING FOO *********
- *******************************/
-
-void Converter::log_error(std::string error_string)
-{
-    ld->add_error_comment(error_string);
-//    std::cout << "ERROR: Failed to convert:\t" << std::endl;
-//    std::cout << "\t\t" << error_string << std::endl << std::endl;
-}
-
-void Converter::print_line(std::istringstream& in)
-{
-    int pos = in.tellg();
-    std::ostringstream oss;
-    oss << in.rdbuf();
-    std::cout << "DEBUG: " << oss.str() << std::endl;
-    in.seekg(pos);
-}
-
-void Converter::print_line(std::ostringstream& in)
-{
-    std::cout << "DEBUG: " << in.str() << std::endl;
-}
-void Converter::print_line(std::string& in)
-{
-    std::cout << "DEBUG: " << in << std::endl;
-}
-
-#if 0
-
-void Converter::inititalize()
-{
-               state = this;
-}
-
-
-
-void Converter::set_state(Converter* c){ 
-    delete state;
-    state = c; 
-}
-
-#endif

diff --git a/tools/snort2lua/util/converter.h b/tools/snort2lua/utils/converter.h
similarity index 83%
rename from tools/snort2lua/util/converter.h
rename to tools/snort2lua/utils/converter.h
index 3cbd3f9a37aec2a5b505aa992cace8fab3aadfff..94cd370678afb0cbf09741b33d836ce7cd6d40c5 100644 (file)
--- a/tools/snort2lua/util/converter.h
+++ b/tools/snort2lua/utils/converter.h
@@ -62,21 +62,8 @@ public:
     int convert_file(std::string input_file);
     // parse an include file.  Use this function to ensure all set options are properly
     void parse_include_file(std::string file);
-    // convert an include file. This function initializes structure which are kept seperate between files.
-//    void convert_include_files(std::string input_file);
     // Should we parse an include file?
     inline bool should_convert_includes() { return parse_includes; }
-    // prints the entire lua configuration to the output file.
-//    friend std::ostream &operator<<( std::ostream& out, const Converter &cv) { return out << (*(cv.ld)); }
-
-
-
-    // log an error in the new lua file
-    void log_error(std::string);
-
-    void print_line(std::istringstream& in);
-    void print_line(std::ostringstream& in);
-    void print_line(std::string& in);
 
 private:
     // the current parsing state.

diff --git a/tools/snort2lua/util/util.cc b/tools/snort2lua/utils/snort2lua_util.cc
similarity index 99%
rename from tools/snort2lua/util/util.cc
rename to tools/snort2lua/utils/snort2lua_util.cc
index 0d89823a6181458ea390d5f3a3f48ffdf2779f04..1c8272a061f2db86c648210a3c59a1fd69d7f11e 100644 (file)
--- a/tools/snort2lua/util/util.cc
+++ b/tools/snort2lua/utils/snort2lua_util.cc
@@ -27,7 +27,7 @@
 #include <sys/stat.h>
 #include <iostream>
 #include <string>
-#include "util/util.h"
+#include "utils/snort2lua_util.h"
 #include "conversion_state.h"
 
 namespace util

diff --git a/tools/snort2lua/util/util.h b/tools/snort2lua/utils/snort2lua_util.h
similarity index 100%
rename from tools/snort2lua/util/util.h
rename to tools/snort2lua/utils/snort2lua_util.h