From: Josh <jrosenba@cisco.com>
Date: Thu, 4 Dec 2014 03:01:07 +0000 (-0600)
Subject: fixing codec plugin problem
X-Git-Tag: 3.0.0-233~1116
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fdb6f92a6e21cc891f341b31a9ab4ddae87dfd14;p=thirdparty%2Fsnort3.git

fixing codec plugin problem
---

fdb6f92a6e21cc891f341b31a9ab4ddae87dfd14
diff --cc src/codecs/CMakeLists.txt
index d1ec5bbbf,d1ec5bbbf..dc68a4d63
--- a/src/codecs/CMakeLists.txt
+++ b/src/codecs/CMakeLists.txt
@@@ -4,18 -4,18 +4,20 @@@ add_subdirectory(link
  add_subdirectory(ip)
  add_subdirectory(misc)
  
--set(CODEC_INCLUDES
++set (CODEC_INCLUDES
      codec_module.h
      codec_events.h
  )
  
--add_library( codecs STATIC
++add_library (codecs STATIC
      ${CODEC_INCLUDES}
      codec_api.h
      codec_api.cc
--    codec_module.cc
  )
  
++add_library (codec_module
++    codec_module.cc
++)
  
  if (STATIC_CODECS)
      set (CODEC_PLUGIN_LIBRARIES
diff --cc src/codecs/codec_module.h
index 7e4259f10,7e4259f10..0146e3541
--- a/src/codecs/codec_module.h
+++ b/src/codecs/codec_module.h
@@@ -210,7 -210,7 +210,7 @@@ enum CodecSi
  // module
  //-------------------------------------------------------------------------
  
--class CodecModule : public Module
++class SO_PUBLIC CodecModule : public Module
  {
  public:
      CodecModule(const char* s, const char* h) : Module(s, h)
diff --cc src/codecs/ip/CMakeLists.txt
index 664c06c7c,664c06c7c..c7ba68c7c
--- a/src/codecs/ip/CMakeLists.txt
+++ b/src/codecs/ip/CMakeLists.txt
@@@ -59,4 -59,4 +59,5 @@@ target_link_libraries( ip_codec
      events
      main
      managers
++    codec_module
  )
diff --cc src/codecs/ip/cd_mobility.cc
index 377cdc59f,377cdc59f..ceb08cdb4
--- a/src/codecs/ip/cd_mobility.cc
+++ b/src/codecs/ip/cd_mobility.cc
@@@ -29,7 -29,7 +29,7 @@@
  #include "main/snort.h"
  
  // yes, macros are necessary. The API and class constructor require different strings.
--#define CD_MOBILE_NAME "mobility"
++#define CD_MOBILE_NAME "ipv6_mobility"
  #define CD_MOBILE_HELP "support for mobility"
  
  namespace
diff --cc src/codecs/link/CMakeLists.txt
index e66e02471,e66e02471..da6d6f26f
--- a/src/codecs/link/CMakeLists.txt
+++ b/src/codecs/link/CMakeLists.txt
@@@ -41,6 -41,6 +41,7 @@@ if(STATIC_CODECS
      target_link_libraries( link_codecs
          events
          managers
++        codec_module
      )
  
  endif(STATIC_CODECS)
diff --cc src/codecs/misc/CMakeLists.txt
index b2f4a2946,b2f4a2946..6425e338d
--- a/src/codecs/misc/CMakeLists.txt
+++ b/src/codecs/misc/CMakeLists.txt
@@@ -24,4 -24,4 +24,5 @@@ add_library( misc_codecs STATI
  
  target_link_libraries( misc_codecs
      protocols
++    codec_module
  )
diff --cc src/codecs/root/CMakeLists.txt
index 2b968a3dd,2b968a3dd..b251601d1
--- a/src/codecs/root/CMakeLists.txt
+++ b/src/codecs/root/CMakeLists.txt
@@@ -41,4 -41,4 +41,8 @@@ if (STATIC_CODECS
          ${PCAP_INCLUDE_DIR}/pcap.h  # rebuild if a new libpcap is installed
      )
  
++    target_link_libraries( root_codecs
++        codec_module
++    )
++
  endif (STATIC_CODECS)