From: Josh Date: Wed, 24 Sep 2014 21:24:46 +0000 (-0400) Subject: plugins compiling X-Git-Tag: 3.0.0-233~1398^2~8^2~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=41b477995d6f98717df29420ace3d23e4397f9cc;p=thirdparty%2Fsnort3.git plugins compiling --- diff --git a/extra/src/codecs/pim.cc b/extra/src/codecs/pim.cc index e45436927..0175d1638 100644 --- a/extra/src/codecs/pim.cc +++ b/extra/src/codecs/pim.cc @@ -58,9 +58,9 @@ void PimCodec::get_protocol_ids(std::vector& 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 f03e0a7fd..7b1acd7ab 100644 --- 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 f320e4e6d..e1e78c955 100644 --- 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 018e2660d..379bc3e43 100644 --- 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 7476acf65..76710d792 100644 --- 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 80e70b565..ae4de46a4 100644 --- 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 91eac5ea5..97ae13c1a 100644 --- 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 4f50ff490..d2fc4577e 100644 --- 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 a71e6a806..bf643a04c 100644 --- 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 643216d1a..7d8f43948 100644 --- 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 ae5ecb73b..d7a7ae2e3 100644 --- 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}