From: Josh <jrosenba@cisco.com>
Date: Mon, 15 Sep 2014 21:46:14 +0000 (-0400)
Subject: tweaking system
X-Git-Tag: 3.0.0-233~1411^2~3^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41ec963accabd12d5146c71ef9a103c55c6fffd0;p=thirdparty%2Fsnort3.git

tweaking system
---

diff --git a/src/codecs/codec_api.cc b/src/codecs/codec_api.cc
index a461d3815..1b19adaf2 100644
--- a/src/codecs/codec_api.cc
+++ b/src/codecs/codec_api.cc
@@ -31,7 +31,6 @@
 
 
 // ip codecs
-extern const BaseApi* cd_esp;
 extern const BaseApi* cd_ipv4; // static due to dependence on fpdetect
 extern const BaseApi* cd_tcp;  // static because only file that specific functions
                                //     (symbols will be removed from final executabel)
@@ -43,7 +42,8 @@ extern const BaseApi* cd_ah;
 extern const BaseApi* cd_arp;
 extern const BaseApi* cd_dstopts;
 extern const BaseApi* cd_erspan2;
-extern const BaseApi* cd_erspan3; 
+extern const BaseApi* cd_erspan3;
+extern const BaseApi* cd_esp;
 extern const BaseApi* cd_frag; 
 extern const BaseApi* cd_gre;
 extern const BaseApi* cd_gtp;
@@ -86,7 +86,6 @@ extern const BaseApi* cd_wlan;
 const BaseApi* codecs[] =
 {
     // non root codecs
-    cd_esp,
     cd_ipv4,
     cd_tcp,
 
@@ -96,6 +95,7 @@ const BaseApi* codecs[] =
     cd_dstopts,
     cd_erspan2,
     cd_erspan3,
+    cd_esp,
     cd_frag,
     cd_gre,
     cd_gtp,
diff --git a/src/codecs/ip/CMakeLists.txt b/src/codecs/ip/CMakeLists.txt
index 577a00b1e..c10111eb8 100644
--- a/src/codecs/ip/CMakeLists.txt
+++ b/src/codecs/ip/CMakeLists.txt
@@ -25,7 +25,6 @@ if( STATIC_CODECS )
 else()
     add_shared_library(cd_auth codecs cd_auth.cc)
     add_shared_library(cd_dst_opts codecs cd_dst_opts.cc ip_util.h ip_util.cc)
-    add_shared_library(cd_gre codecs cd_gre.cc)
     add_shared_library(cd_esp codecs cd_esp.cc ip_util.h ip_util.cc)
     add_shared_library(cd_frag codecs cd_frag.cc ip_util.h ip_util.cc)
     add_shared_library(cd_gre codecs cd_gre.cc)
diff --git a/src/codecs/ip/cd_esp.cc b/src/codecs/ip/cd_esp.cc
index 27ac789d9..e06505f8d 100644
--- a/src/codecs/ip/cd_esp.cc
+++ b/src/codecs/ip/cd_esp.cc
@@ -223,5 +223,12 @@ static const CodecApi esp_api =
 };
 
 
+#ifdef BUILDING_SO
+SO_PUBLIC const BaseApi* snort_plugins[] =
+{
+    &esp_api.base,
+    nullptr
+};
+#else
 const BaseApi* cd_esp = &esp_api.base;
-
+#endif
diff --git a/src/codecs/misc/cd_gtp.cc b/src/codecs/misc/cd_gtp.cc
index edac6341d..fa986be5d 100644
--- a/src/codecs/misc/cd_gtp.cc
+++ b/src/codecs/misc/cd_gtp.cc
@@ -107,7 +107,7 @@ void GtpCodec::get_protocol_ids(std::vector<uint16_t>& v)
  *
  */
 
-bool GtpCodec::decode(const RawData& raw, CodecData& codec, SnortData& snort)
+bool GtpCodec::decode(const RawData& raw, CodecData& codec, SnortData&)
 {
     uint8_t  next_hdr_type;
     uint8_t  version;