plugins compiling

diff --git a/extra/src/codecs/pim.cc b/extra/src/codecs/pim.cc
index e4543692784ceaecb961900429f6c41d41a58274..0175d1638b5d0aca6b7e520fbd56a7331b16c290 100644 (file)
--- a/extra/src/codecs/pim.cc
+++ b/extra/src/codecs/pim.cc
@@ -58,9 +58,9 @@ void PimCodec::get_protocol_ids(std::vector<uint16_t>& v)
     v.push_back(IPPROTO_ID_PIM);
 }
 
-bool PimCodec::decode(const RawData&, CodecData&, SnortData&)
+bool PimCodec::decode(const RawData&, CodecData& codec, SnortData&)
 {
-    codec_events::decoder_event(DECODE_IP_BAD_PROTO);
+    codec_events::decoder_event(codec, DECODE_IP_BAD_PROTO);
     return true;
 }
 

diff --git a/extra/src/codecs/token_ring.cc b/extra/src/codecs/token_ring.cc
index f03e0a7fd496154cf3839674a18055746375b3b3..7b1acd7abfedfad011bb08b5a68e83e734d03244 100644 (file)
--- a/extra/src/codecs/token_ring.cc
+++ b/extra/src/codecs/token_ring.cc
@@ -113,7 +113,7 @@ bool TrCodec::decode(const RawData& raw, CodecData& codec, SnortData&)
 
     if(cap_len < sizeof(token_ring::Trh_hdr))
     {
-        codec_events::decoder_event(DECODE_BAD_TRH);
+        codec_events::decoder_event(codec, DECODE_BAD_TRH);
         return false;
     }
 
@@ -139,7 +139,7 @@ bool TrCodec::decode(const RawData& raw, CodecData& codec, SnortData&)
      */
     if(cap_len < (sizeof(token_ring::Trh_hdr) + sizeof(token_ring::Trh_llc)))
     {
-        codec_events::decoder_event(DECODE_BAD_TR_ETHLLC);
+        codec_events::decoder_event(codec, DECODE_BAD_TR_ETHLLC);
         return false;
     }
 
@@ -156,7 +156,7 @@ bool TrCodec::decode(const RawData& raw, CodecData& codec, SnortData&)
 
         if(cap_len < (sizeof(token_ring::Trh_hdr) + sizeof(token_ring::Trh_llc) + sizeof(token_ring::Trh_mr)))
         {
-            codec_events::decoder_event(DECODE_BAD_TRHMR);
+            codec_events::decoder_event(codec, DECODE_BAD_TRHMR);
             return false;
         }
 
@@ -167,7 +167,7 @@ bool TrCodec::decode(const RawData& raw, CodecData& codec, SnortData&)
         if(cap_len < (sizeof(token_ring::Trh_hdr) + sizeof(token_ring::Trh_llc) +
                       sizeof(token_ring::Trh_mr) + TRH_MR_LEN(trhmr)))
         {
-            codec_events::decoder_event(DECODE_BAD_TR_MR_LEN);
+            codec_events::decoder_event(codec, DECODE_BAD_TR_MR_LEN);
             return false;
         }
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f320e4e6dc7afac825eba0130b87e64c17004851..e1e78c955b0e60acfc326789c3a873007eae0e87 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -11,6 +11,7 @@ set(EXTERNAL_LIBRARIES
     ${DAQ_LIBRARIES}
     ${DNET_LIBRARIES}
     ${CLANG_CXX_LIBRARY}
+    ${CMAKE_THREAD_LIBS_INIT} # GCC says we must link to the threads library
     CACHE INTERNAL "external libraries" FORCE
 )
 

diff --git a/src/log/log.cc b/src/log/log.cc
index 018e2660de8b217b13a282dade93832885b4782d..379bc3e43042ecde8b51f792c2828f303a95372c 100644 (file)
--- a/src/log/log.cc
+++ b/src/log/log.cc
@@ -147,10 +147,10 @@ void CloseLogger()
     TextLog_Term(text_log);
 }
 
-void LogIPPkt(int type, Packet* p)
+void LogIPPkt(Packet* p)
 {
     log_mutex.lock();
-    LogIPPkt(text_log, type, p);
+    LogIPPkt(text_log, p);
     TextLog_Flush(text_log);
     log_mutex.unlock();
 }
@@ -159,7 +159,7 @@ void snort_print(Packet* p)
 {
     if (p->ptrs.ip_api.is_valid())
     {
-        LogIPPkt(text_log, p->ptrs.ip_api.proto(), p);
+        LogIPPkt(text_log, p);
     }
 #if 0
     // ARP not impelemted

diff --git a/src/log/log.h b/src/log/log.h
index 7476acf6537487b945922e8f201dab52e40cdea0..76710d792b103d295abdf3a2a41b7a85f04d51fc 100644 (file)
--- a/src/log/log.h
+++ b/src/log/log.h
@@ -38,7 +38,7 @@ int RollAlertFile(const char *);
 
 void OpenLogger();
 void CloseLogger();
-void LogIPPkt(int type, Packet*);
+void LogIPPkt(Packet*);
 void snort_print(Packet*);
 void LogNetData(const uint8_t* data, const int len, Packet* p = NULL);
 

diff --git a/src/log/log_text.cc b/src/log/log_text.cc
index 80e70b565630cb0ddf27fe927511713a0ef6fa40..ae4de46a493f7236e4dbeac2afbea3a1bdf844a4 100644 (file)
--- a/src/log/log_text.cc
+++ b/src/log/log_text.cc
@@ -1682,13 +1682,8 @@ static void LogPacketType(TextLog* log, Packet* p)
 #define DATA_LEN(p) \
     (p->ptrs.ip_api.actual_ip_len() - (p->ptrs.ip_api.hlen() << 2))
 
-void LogIPPkt(TextLog* log, int type, Packet * p)
+void LogIPPkt(TextLog* log, Packet * p)
 {
-#ifdef DEBUG_MSGS
-    DEBUG_WRAP(DebugMessage(DEBUG_LOG, "LogIPPkt type = %d\n", type););
-#else
-    UNUSED(type);
-#endif
     LogPacketType(log, p);
     TextLog_Print(log, "%s\n", SEPARATOR);
 

diff --git a/src/log/log_text.h b/src/log/log_text.h
index 91eac5ea58a35d922e2d506215cab7123514e0f2..97ae13c1ad56f79f3eb5f2142e55bb817fb533cf 100644 (file)
--- a/src/log/log_text.h
+++ b/src/log/log_text.h
@@ -53,7 +53,7 @@ typedef ip::IP4Hdr IP4Hdr;
 void LogPriorityData(TextLog*, const Event*, bool doNewLine);
 void LogXrefs(TextLog*, const Event*, bool doNewLine);
 
-void LogIPPkt(TextLog*, int type, Packet*);
+void LogIPPkt(TextLog*, Packet*);
 void LogNetData (TextLog*, const uint8_t* data, const int len, Packet*);
 
 void LogTimeStamp(TextLog*, Packet*);

diff --git a/src/loggers/alert_fast.cc b/src/loggers/alert_fast.cc
index 4f50ff490ac29441ab9ba4799a0d80523bbe18fb..d2fc4577e8c539c9d4a879132c67ff5e333395d1 100644 (file)
--- a/src/loggers/alert_fast.cc
+++ b/src/loggers/alert_fast.cc
@@ -248,7 +248,7 @@ void FastLogger::alert(Packet *p, const char *msg, Event *event)
     if(packet)
     {
         if(p->ptrs.ip_api.is_valid())
-            LogIPPkt(fast_log, p->ptrs.ip_api.proto(), p);
+            LogIPPkt(fast_log, p);
 
 #if 0
         // FIXIT-L -J LogArpHeader unimplemented

diff --git a/src/stream/ip/ip_defrag.cc b/src/stream/ip/ip_defrag.cc
index a71e6a8060c69ef83351433cf534a757ff1b56fe..bf643a04c296886e6216d66ecfd41245a16f74c4 100644 (file)
--- a/src/stream/ip/ip_defrag.cc
+++ b/src/stream/ip/ip_defrag.cc
@@ -1048,7 +1048,7 @@ static void FragRebuild(FragTracker *ft, Packet *p)
      * data that is established when the packet is decoded.
      */
     if (DEBUG_FRAG & GetDebugLevel())
-        LogIPPkt(dpkt->iph->ip_proto, &dpkt);
+        LogIPPkt(&dpkt);
 
 #endif
 

diff --git a/src/stream/tcp/tcp_session.cc b/src/stream/tcp/tcp_session.cc
index 643216d1aa091c7809046436eab4c487a2754788..7d8f43948d70d4949ae55e30f26db8fd0d298d6e 100644 (file)
--- a/src/stream/tcp/tcp_session.cc
+++ b/src/stream/tcp/tcp_session.cc
@@ -1890,7 +1890,7 @@ static void ShowRebuiltPacket (TcpSession* ssn, Packet* pkt)
 {
     if ( (ssn->client.config->flags & STREAM5_CONFIG_SHOW_PACKETS) ||
          (ssn->server.config->flags & STREAM5_CONFIG_SHOW_PACKETS) )
-        LogIPPkt(IPPROTO_TCP, pkt);
+        LogIPPkt(pkt);
 }
 
 static inline unsigned int getSegmentFlushSize(

diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt
index ae5ecb73b8e1d5f9c1f297c6ae22cc87d83ae5e7..d7a7ae2e3abbeec1c94c203d597a2f4a3721d8f6 100644 (file)
--- a/src/utils/CMakeLists.txt
+++ b/src/utils/CMakeLists.txt
@@ -61,17 +61,9 @@ ADD_LIBRARY( utils STATIC
     util_unfold.h
 )
 
-
-set_default_visibility_compile_flag(utils)
-
 target_link_libraries(utils
     log
-    ${CMAKE_THREAD_LIBS_INIT}
-)
-
-set_target_properties( utils PROPERTIES
-    COMPILE_FLAGS "-std=c++11 -DHAVE_PTHREADS  -pthread"
-    LINK_FLAGS "-pthread -lpthread pthreads -lpthreads"
+#
 )
 
 install (FILES ${UTIL_INCLUDES}