From: Michael Altizer (mialtize) <mialtize@cisco.com>
Date: Mon, 28 Nov 2016 15:37:44 +0000 (-0500)
Subject: Merge pull request #724 in SNORT/snort3 from gtp_duplicates to master
X-Git-Tag: 3.0.0-233~170
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=486d00e9c9d7eee2188a1a95c57695425f74d877;p=thirdparty%2Fsnort3.git

Merge pull request #724 in SNORT/snort3 from gtp_duplicates to master

Squashed commit of the following:

commit abde9b0d9432302fc1ad7dc1a776d92525116564
Author: allewi <allewi@cisco.com>
Date:   Sun Nov 27 13:08:38 2016 -0500

    added line to prevent duplicate gtp configurations from being printed
---

diff --git a/tools/snort2lua/preprocessor_states/pps_gtp.cc b/tools/snort2lua/preprocessor_states/pps_gtp.cc
index 368a1baf7..068205e0b 100644
--- a/tools/snort2lua/preprocessor_states/pps_gtp.cc
+++ b/tools/snort2lua/preprocessor_states/pps_gtp.cc
@@ -68,6 +68,8 @@ bool Gtp::convert(std::istringstream& data_stream)
     bind.set_when_proto("udp");
     bind.set_use_type("gtp_inspect");
 
+    converted_args = true;
+
     table_api.open_table("gtp_inspect");
 
     // parse the file configuration
@@ -134,4 +136,3 @@ static const ConvertMap preprocessor_gtp =
 
 const ConvertMap* gtp_map = &preprocessor_gtp;
 } // namespace preprocessors
-