tweak after pulling current code

diff --git a/doc/config_changes.txt b/doc/config_changes.txt
index e2c2936198badb5e52ebb5672b1dc1635cd81639..37f68470988e8a728ea71e46039e4c616cce3989 100644 (file)
--- a/doc/config_changes.txt
+++ b/doc/config_changes.txt
@@ -112,7 +112,7 @@ change -> normalizers: 'trim_mss' ==> 'trim'
 change -> normalizers: 'trim_rst' ==> 'trim'
 change -> normalizers: 'trim_syn' ==> 'trim'
 change -> normalizers: 'trim_win' ==> 'trim'
-change -> paf_max: 'paf_max [0:63780]' ==> 'paf_max [1460:63780]'
+change -> paf_max: 'paf_max [0:63780]' ==> 'max_pdu [1460:63780]'
 change -> perfmonitor: 'accumulate' ==> 'reset = false'
 change -> perfmonitor: 'flow-file' ==> 'flow_file = true'
 change -> perfmonitor: 'flow-ip' ==> 'flow_ip'

diff --git a/tools/snort2lua/config_states/config_binding.cc b/tools/snort2lua/config_states/config_binding.cc
index efa6f0c973c1b36931595646f70eb78318fa2d9a..50cb49cac524d883b57ae9a741c9fbcf8540639c 100644 (file)
--- a/tools/snort2lua/config_states/config_binding.cc
+++ b/tools/snort2lua/config_states/config_binding.cc
@@ -192,10 +192,8 @@ bool Binding::convert(std::istringstream& data_stream)
         {
             Converter cv;
 
-            if (cv.convert(input_file, input_file + ".lua") < 0)
+            if (cv.convert(full_path, full_path + ".lua") < 0)
                 rc = false;
-
-            parse_file(full_path);
         }
     }
 

diff --git a/tools/snort2lua/config_states/config_policy_id.cc b/tools/snort2lua/config_states/config_policy_id.cc
index d7889e864fe622e5704ee444a4800ac69cda9f07..5ba3a43e863c2176d3f1da35f3048f6139dad39a 100644 (file)
--- a/tools/snort2lua/config_states/config_policy_id.cc
+++ b/tools/snort2lua/config_states/config_policy_id.cc
@@ -32,8 +32,8 @@ namespace {
 class PolicyId : public ConversionState
 {
 public:
-    PolicyId() : ConversionState() {};
-    virtual ~PolicyId() {};
+    PolicyId(Converter& c) : ConversionState(c) { }
+    virtual ~PolicyId() { }
     virtual bool convert(std::istringstream& data_stream);
 };
 
@@ -75,10 +75,8 @@ bool PolicyId::convert(std::istringstream& data_stream)
  *******  A P I ***********
  **************************/
 
-static ConversionState* ctor()
-{
-    return new PolicyId();
-}
+static ConversionState* ctor(Converter& c)
+{ return new PolicyId(c); }
 
 static const ConvertMap policy_id_api =
 {

diff --git a/tools/snort2lua/tests/snort.conf.in b/tools/snort2lua/tests/snort.conf.in
index a1cee460e233c4ad2a2ffe235a3a8a1d855db2bd..b9e39aa89cc9744c8c2a52efbd03a1fe07a1f95a 100644 (file)
--- a/tools/snort2lua/tests/snort.conf.in
+++ b/tools/snort2lua/tests/snort.conf.in
@@ -247,6 +247,7 @@ config file: type_id,  signature,  file_type_depth   104800,  file_signature_dep
 config policy_mode: tap
 event_filter gen_id 119,sig_id 404,type limit, track by_src, count 10,seconds 20
 rate_filter gen_id 119,sig_id 404, track by_src, count 10,seconds 20, timeout 50, new_action reject, apply_to [[2.3.4.5/24],!3.3.4.5/24]
+config paf_max: 54321
 config paf_max: 00
 config ignore_ports: tcp 21 6667:6671 1356
 config ignore_ports: udp 1:17 53