tweaking system

diff --git a/src/codecs/codec_api.cc b/src/codecs/codec_api.cc
index a461d3815d1274a159a90be5d6d6aba047c5cb98..1b19adaf24aaf5f57587c2d8d984ad1a24ba3a50 100644 (file)
--- 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 577a00b1ecbff3d645fbf912c8026ff1360934bc..c10111eb8163bde860edbe85f1433cf6cc9bfe9b 100644 (file)
--- 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 27ac789d9e69a7563d792f432b8917f99bf182e8..e06505f8da451de660cec9b401a48926259e862c 100644 (file)
--- 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 edac6341d2bf6a4affb0865cb7c9d8c6eb98eb84..fa986be5dc601b2f0be663082525a2ec1e392b73 100644 (file)
--- 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;