From: Josh <jrosenba@cisco.com>
Date: Fri, 10 Oct 2014 18:48:30 +0000 (-0500)
Subject: tweak after pulling current code
X-Git-Tag: 3.0.0-233~1383^2~7^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8ed110c2d26a24c6150d1253c8495c93c8f34622;p=thirdparty%2Fsnort3.git

tweak after pulling current code
---

diff --git a/doc/config_changes.txt b/doc/config_changes.txt
index e2c293619..37f684709 100644
--- 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 efa6f0c97..50cb49cac 100644
--- 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 d7889e864..5ba3a43e8 100644
--- 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 a1cee460e..b9e39aa89 100644
--- 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