From: Russ Combs (rucombs) Date: Wed, 8 Jun 2016 22:13:26 +0000 (-0400) Subject: Merge pull request #507 in SNORT/snort3 from ~MIALTIZE/snort3:for-russ-trivial to... X-Git-Tag: 3.0.0-233~373 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=161b5cab8aeb45caf87464aafa8743ead43c995d;p=thirdparty%2Fsnort3.git Merge pull request #507 in SNORT/snort3 from ~MIALTIZE/snort3:for-russ-trivial to master Squashed commit of the following: commit f17556d34c5ef087e95a99b30708d9ec8910166e Author: Michael Altizer Date: Wed Jun 8 16:44:08 2016 -0400 extra: Make autotools build quiet again and remove extraneous semicolon. commit c6ee6b94802b40a31d915e8ce801694a0bd5c845 Author: Michael Altizer Date: Wed Jun 8 16:38:14 2016 -0400 flow: Clarify key hashing function commit f671d582019fa905ca8fc4419d9a787512259b2d Author: Michael Altizer Date: Wed Jun 8 16:37:43 2016 -0400 dce_rpc: Fix missing prototype compiler warnings commit dd24d4b4ebbd12466557624164d24e6c7c3e2548 Author: Michael Altizer Date: Tue Jun 7 15:20:03 2016 -0400 ftp_telnet: Clean up includes commit fbfc06f05247d53d9aa6f15e3191e6eb3c4f3bdd Author: Michael Altizer Date: Tue Jun 7 14:00:10 2016 -0400 autotools: Remove GCC version check as C++11 macro is sufficient --- diff --git a/configure.ac b/configure.ac index 5d2afa5eb..d2c73acf7 100644 --- a/configure.ac +++ b/configure.ac @@ -44,16 +44,6 @@ AC_PROG_MAKE_SET AC_C_BIGENDIAN AC_C_INLINE -# g++ 4.7 will pass the c++11 check but is not sufficient -if test "x$CXX" = "xg++" ; then - if `$CXX -dumpversion | awk '{exit $1<4.8?0:1}'` ; then - echo - echo " ERROR: g++ >= 4.8 is required" - echo - exit 1 - fi -fi - CFLAGS="-std=gnu99 $CFLAGS" AX_CXX_COMPILE_STDCXX_11([noext], [mandatory]) diff --git a/extra/configure.ac b/extra/configure.ac index a0a77f9fb..d9340c7f9 100644 --- a/extra/configure.ac +++ b/extra/configure.ac @@ -3,6 +3,7 @@ AC_PREREQ([2.69]) AC_CONFIG_MACRO_DIRS([m4]) AM_INIT_AUTOMAKE([foreign]) +AM_SILENT_RULES([yes]) AC_PROG_CC([clang gcc]) AC_PROG_CXX([clang++ g++]) diff --git a/extra/src/inspectors/data_log/data_log.cc b/extra/src/inspectors/data_log/data_log.cc index 019c9c885..5daa5435e 100644 --- a/extra/src/inspectors/data_log/data_log.cc +++ b/extra/src/inspectors/data_log/data_log.cc @@ -104,7 +104,7 @@ public: DataLog(std::string s) { key = s; } void show(SnortConfig*) override; - void eval(Packet*) override { }; + void eval(Packet*) override { } bool configure(SnortConfig*) override { diff --git a/src/flow/flow_key.cc b/src/flow/flow_key.cc index 33b9899c2..d7f6a8f92 100644 --- a/src/flow/flow_key.cc +++ b/src/flow/flow_key.cc @@ -261,9 +261,6 @@ void FlowKey::init( uint32_t FlowKey::hash(SFHASHFCN*, unsigned char* d, int) { uint32_t a,b,c; - uint32_t offset = 0; - uint32_t tmp = 0; - uint32_t tmp2 = 0; a = *(uint32_t*)d; /* IPv6 lo[0] */ b = *(uint32_t*)(d+4); /* IPv6 lo[1] */ @@ -283,16 +280,10 @@ uint32_t FlowKey::hash(SFHASHFCN*, unsigned char* d, int) mix(a,b,c); - offset=36; - a += *(uint32_t*)(d+offset); /* vlan, protocol, & version */ - tmp = *(uint32_t*)(d+offset+4); - if ( tmp ) - { - b += tmp; /* mpls label */ - } - offset += 8; /* skip past vlan/proto/ipver & mpls label */ - tmp2 = *(uint32_t*)(d+offset); /* after offset that has been moved */ - c += tmp2; /* address space id and 16bits of zero'd pad */ + a += *(uint32_t*)(d+36); /* vlan tag, packet type, & version */ + b += *(uint32_t*)(d+40); /* mpls label */ + c += *(uint32_t*)(d+44); /* address space id and 16bits of zero'd pad */ + finalize(a,b,c); return c; diff --git a/src/service_inspectors/dce_rpc/dce_smb.cc b/src/service_inspectors/dce_rpc/dce_smb.cc index 151ca6c57..29a7b9b82 100644 --- a/src/service_inspectors/dce_rpc/dce_smb.cc +++ b/src/service_inspectors/dce_rpc/dce_smb.cc @@ -1470,7 +1470,7 @@ static DCE2_SmbRequestTracker* DCE2_SmbInspect(DCE2_SmbSsnData* ssd, const SmbNt } // Temporary command function placeholder, until all of them are ported -DCE2_Ret DCE2_SmbComFuncPlaceholder(DCE2_SmbSsnData*, const SmbNtHdr*, +static DCE2_Ret DCE2_SmbComFuncPlaceholder(DCE2_SmbSsnData*, const SmbNtHdr*, const DCE2_SmbComInfo*, const uint8_t*, uint32_t) { return DCE2_RET__SUCCESS; @@ -1518,7 +1518,7 @@ static bool DCE2_SmbAutodetect(Packet* p) return false; } -void DCE2_SmbDataFree(DCE2_SmbSsnData* ssd) +static void DCE2_SmbDataFree(DCE2_SmbSsnData* ssd) { if (ssd == nullptr) return; @@ -1781,7 +1781,7 @@ static DCE2_Ret DCE2_NbssHdrChecks(DCE2_SmbSsnData* ssd, const NbssHdr* nb_hdr) * Returns: None * ********************************************************************/ -void DCE2_SmbProcess(DCE2_SmbSsnData* ssd) +static void DCE2_SmbProcess(DCE2_SmbSsnData* ssd) { DebugMessage(DEBUG_DCE_SMB, "Processing SMB packet.\n"); dce2_smb_stats.smb_pkts++; @@ -2022,7 +2022,7 @@ void DCE2_SmbProcess(DCE2_SmbSsnData* ssd) * Returns: None * ********************************************************************/ -void DCE2_SmbInitGlobals() +static void DCE2_SmbInitGlobals() { memset(&smb_wcts, 0, sizeof(smb_wcts)); memset(&smb_bccs, 0, sizeof(smb_bccs)); diff --git a/src/service_inspectors/dce_rpc/dce_smb_commands.cc b/src/service_inspectors/dce_rpc/dce_smb_commands.cc index cc1dc8cc9..6bf504205 100644 --- a/src/service_inspectors/dce_rpc/dce_smb_commands.cc +++ b/src/service_inspectors/dce_rpc/dce_smb_commands.cc @@ -21,9 +21,10 @@ // Smb commands processing -#include "dce_smb.h" -#include "dce_smb_utils.h" +#include "dce_smb_commands.h" + #include "dce_smb_module.h" + #include "main/snort_debug.h" #include "utils/util.h" #include "detection/detect.h" diff --git a/src/service_inspectors/dce_rpc/dce_smb_commands.h b/src/service_inspectors/dce_rpc/dce_smb_commands.h index 4f4dd8b80..d15d670ab 100644 --- a/src/service_inspectors/dce_rpc/dce_smb_commands.h +++ b/src/service_inspectors/dce_rpc/dce_smb_commands.h @@ -22,7 +22,7 @@ #ifndef DCE_SMB_COMMANDS_H #define DCE_SMB_COMMANDS_H -#include "dce_smb.h" +#include "dce_smb_utils.h" DCE2_Ret DCE2_SmbOpen(DCE2_SmbSsnData*, const SmbNtHdr*, const DCE2_SmbComInfo*, const uint8_t*, uint32_t); diff --git a/src/service_inspectors/ftp_telnet/ft_main.cc b/src/service_inspectors/ftp_telnet/ft_main.cc index 3c220e6e6..4632a7c92 100644 --- a/src/service_inspectors/ftp_telnet/ft_main.cc +++ b/src/service_inspectors/ftp_telnet/ft_main.cc @@ -44,29 +44,14 @@ #include "config.h" #endif -#include -#include -#include -#include -#include - #include "ftpp_return_codes.h" -#include "ftpp_ui_config.h" #include "ftp_cmd_lookup.h" #include "ftp_bounce_lookup.h" -#include "ftpp_si.h" -#include "pp_telnet.h" -#include "pp_ftp.h" - -#include "main/snort_types.h" -#include "main/snort_debug.h" -#include "stream/stream_api.h" -#include "profiler/profiler.h" -#include "detection/detection_util.h" -#include "parser/parser.h" -#include "utils/sfsnprintfappend.h" + +#include "detection/detect.h" #include "framework/data_bus.h" -#include "sfip/sf_ip.h" +#include "log/messages.h" +#include "utils/util.h" void CleanupFTPCMDConf(void* ftpCmd) { diff --git a/src/service_inspectors/ftp_telnet/ft_main.h b/src/service_inspectors/ftp_telnet/ft_main.h index 306e37d4b..61ee0f8fa 100644 --- a/src/service_inspectors/ftp_telnet/ft_main.h +++ b/src/service_inspectors/ftp_telnet/ft_main.h @@ -38,7 +38,6 @@ #include "ftpp_ui_config.h" #include "protocols/packet.h" -#include "framework/bits.h" #define BUF_SIZE 1024 diff --git a/src/service_inspectors/ftp_telnet/ftp.cc b/src/service_inspectors/ftp_telnet/ftp.cc index 93e5bab5b..25afbdc5b 100644 --- a/src/service_inspectors/ftp_telnet/ftp.cc +++ b/src/service_inspectors/ftp_telnet/ftp.cc @@ -21,14 +21,8 @@ #include "config.h" #endif -#include -#include -#include -#include - #include "ftp_module.h" #include "ftpp_si.h" -#include "ftpp_ui_config.h" #include "ftpp_return_codes.h" #include "ftp_cmd_lookup.h" #include "ft_main.h" @@ -40,15 +34,10 @@ #include "telnet.h" #include "main/snort_types.h" -#include "main/snort_debug.h" -#include "stream/stream_api.h" -#include "file_api/file_api.h" -#include "parser/parser.h" -#include "framework/inspector.h" #include "managers/inspector_manager.h" -#include "detection/detection_util.h" -#include "target_based/snort_protocols.h" #include "profiler/profiler.h" +#include "target_based/snort_protocols.h" +#include "utils/util.h" int16_t ftp_data_app_id = SFTARGET_UNKNOWN_PROTOCOL; diff --git a/src/service_inspectors/ftp_telnet/ftp_bounce_lookup.cc b/src/service_inspectors/ftp_telnet/ftp_bounce_lookup.cc index 75bc46329..835e4e7bf 100644 --- a/src/service_inspectors/ftp_telnet/ftp_bounce_lookup.cc +++ b/src/service_inspectors/ftp_telnet/ftp_bounce_lookup.cc @@ -37,12 +37,6 @@ #include "ftp_bounce_lookup.h" -#include -#include -#include - -#include "utils/kmap.h" -#include "ftpp_ui_config.h" #include "ftpp_return_codes.h" #include "ft_main.h" diff --git a/src/service_inspectors/ftp_telnet/ftp_bounce_lookup.h b/src/service_inspectors/ftp_telnet/ftp_bounce_lookup.h index 3fc569f89..4133aad7a 100644 --- a/src/service_inspectors/ftp_telnet/ftp_bounce_lookup.h +++ b/src/service_inspectors/ftp_telnet/ftp_bounce_lookup.h @@ -32,7 +32,6 @@ #ifndef FTP_BOUNCE_LOOKUP_H #define FTP_BOUNCE_LOOKUP_H -#include "ftpp_include.h" #include "ftpp_ui_config.h" int ftp_bounce_lookup_init(BOUNCE_LOOKUP** BounceLookup); diff --git a/src/service_inspectors/ftp_telnet/ftp_client.h b/src/service_inspectors/ftp_telnet/ftp_client.h index 5fd97dbd2..264e2357a 100644 --- a/src/service_inspectors/ftp_telnet/ftp_client.h +++ b/src/service_inspectors/ftp_telnet/ftp_client.h @@ -33,9 +33,6 @@ * to access client inspection. */ -#include -#include "ftpp_include.h" - struct FTP_CLIENT_REQ { const char* cmd_line; diff --git a/src/service_inspectors/ftp_telnet/ftp_cmd_lookup.cc b/src/service_inspectors/ftp_telnet/ftp_cmd_lookup.cc index 5642dd5b2..9279413a6 100644 --- a/src/service_inspectors/ftp_telnet/ftp_cmd_lookup.cc +++ b/src/service_inspectors/ftp_telnet/ftp_cmd_lookup.cc @@ -36,12 +36,6 @@ #include "ftp_cmd_lookup.h" -#include -#include -#include - -#include "utils/kmap.h" -#include "ftpp_ui_config.h" #include "ftpp_return_codes.h" #include "ft_main.h" diff --git a/src/service_inspectors/ftp_telnet/ftp_cmd_lookup.h b/src/service_inspectors/ftp_telnet/ftp_cmd_lookup.h index 1037c8461..868fd4b1e 100644 --- a/src/service_inspectors/ftp_telnet/ftp_cmd_lookup.h +++ b/src/service_inspectors/ftp_telnet/ftp_cmd_lookup.h @@ -32,7 +32,6 @@ #ifndef FTP_CMD_LOOKUP_H #define FTP_CMD_LOOKUP_H -#include "ftpp_include.h" #include "ftpp_ui_config.h" int ftp_cmd_lookup_init(CMD_LOOKUP** CmdLookup); diff --git a/src/service_inspectors/ftp_telnet/ftp_data.cc b/src/service_inspectors/ftp_telnet/ftp_data.cc index d56b3c7a2..59a884ce3 100644 --- a/src/service_inspectors/ftp_telnet/ftp_data.cc +++ b/src/service_inspectors/ftp_telnet/ftp_data.cc @@ -23,33 +23,14 @@ #include "config.h" #endif -#include -#include -#include -#include - #include "ftp_module.h" #include "ftpp_si.h" -#include "ftpp_ui_config.h" -#include "ftpp_return_codes.h" -#include "ftp_cmd_lookup.h" -#include "ft_main.h" -#include "ftp_parse.h" -#include "ftp_print.h" -#include "ftp_splitter.h" -#include "pp_ftp.h" - -#include "main/snort_types.h" -#include "main/snort_debug.h" -#include "stream/stream_api.h" -#include "file_api/file_api.h" + +#include "detection/detection_util.h" #include "file_api/file_service.h" #include "file_api/file_flows.h" -#include "parser/parser.h" -#include "framework/inspector.h" -#include "detection/detection_util.h" -#include "protocols/tcp.h" #include "profiler/profiler.h" +#include "utils/util.h" #define s_name "ftp_data" diff --git a/src/service_inspectors/ftp_telnet/ftp_module.cc b/src/service_inspectors/ftp_telnet/ftp_module.cc index 75fe77219..dbb69f3ec 100644 --- a/src/service_inspectors/ftp_telnet/ftp_module.cc +++ b/src/service_inspectors/ftp_telnet/ftp_module.cc @@ -23,7 +23,6 @@ #include #include "log/messages.h" -#include "parser/parser.h" using namespace std; diff --git a/src/service_inspectors/ftp_telnet/ftp_parse.cc b/src/service_inspectors/ftp_telnet/ftp_parse.cc index bbbe6a684..402ae2ea9 100644 --- a/src/service_inspectors/ftp_telnet/ftp_parse.cc +++ b/src/service_inspectors/ftp_telnet/ftp_parse.cc @@ -29,29 +29,12 @@ #include "config.h" #endif -#include -#include -#include -#include -#include - -#include "ftpp_return_codes.h" -#include "ftpp_ui_config.h" -#include "ftp_cmd_lookup.h" #include "ftp_bounce_lookup.h" -#include "ftpp_si.h" -#include "pp_telnet.h" -#include "pp_ftp.h" - -#include "main/snort_types.h" -#include "main/snort_debug.h" -#include "stream/stream_api.h" -#include "profiler/profiler.h" -#include "detection/detection_util.h" -#include "parser/parser.h" -#include "parser/mstring.h" -#include "utils/sfsnprintfappend.h" +#include "ftp_cmd_lookup.h" +#include "ftpp_return_codes.h" + #include "sfip/sf_ip.h" +#include "utils/util.h" #define CONF_SEPARATORS " \n" diff --git a/src/service_inspectors/ftp_telnet/ftp_print.cc b/src/service_inspectors/ftp_telnet/ftp_print.cc index 798a7b4ec..c7934da64 100644 --- a/src/service_inspectors/ftp_telnet/ftp_print.cc +++ b/src/service_inspectors/ftp_telnet/ftp_print.cc @@ -29,30 +29,14 @@ #include "config.h" #endif -#include -#include -#include -#include -#include - -#include "ftpp_return_codes.h" -#include "ftpp_ui_config.h" +#include "ft_main.h" #include "ftp_cmd_lookup.h" #include "ftp_bounce_lookup.h" -#include "ftpp_si.h" -#include "pp_telnet.h" -#include "pp_ftp.h" -#include "ft_main.h" #include "ftp_parse.h" +#include "ftpp_return_codes.h" -#include "main/snort_types.h" -#include "main/snort_debug.h" -#include "stream/stream_api.h" -#include "profiler/profiler.h" -#include "detection/detection_util.h" -#include "parser/parser.h" +#include "log/messages.h" #include "utils/sfsnprintfappend.h" -#include "sfip/sf_ip.h" int PrintConfOpt(bool on, const char* Option) { diff --git a/src/service_inspectors/ftp_telnet/ftp_server.h b/src/service_inspectors/ftp_telnet/ftp_server.h index fb428384d..f2038731c 100644 --- a/src/service_inspectors/ftp_telnet/ftp_server.h +++ b/src/service_inspectors/ftp_telnet/ftp_server.h @@ -33,8 +33,6 @@ * inspection. */ -#include "ftpp_include.h" - typedef struct s_FTP_SERVER_RSP { char* rsp_line; diff --git a/src/service_inspectors/ftp_telnet/ftp_splitter.cc b/src/service_inspectors/ftp_telnet/ftp_splitter.cc index 9e5de332a..020de9cc8 100644 --- a/src/service_inspectors/ftp_telnet/ftp_splitter.cc +++ b/src/service_inspectors/ftp_telnet/ftp_splitter.cc @@ -18,6 +18,7 @@ // ftp_splitter.cc author Russ Combs #include "ftp_splitter.h" + #include FtpSplitter::FtpSplitter(bool c2s) : StreamSplitter(c2s) { } diff --git a/src/service_inspectors/ftp_telnet/ftpp_include.h b/src/service_inspectors/ftp_telnet/ftpp_include.h deleted file mode 100644 index 5004f7e79..000000000 --- a/src/service_inspectors/ftp_telnet/ftpp_include.h +++ /dev/null @@ -1,43 +0,0 @@ -//-------------------------------------------------------------------------- -// Copyright (C) 2014-2016 Cisco and/or its affiliates. All rights reserved. -// Copyright (C) 2004-2013 Sourcefire, Inc. -// -// This program is free software; you can redistribute it and/or modify it -// under the terms of the GNU General Public License Version 2 as published -// by the Free Software Foundation. You may not use, modify or distribute -// this program under any other version of the GNU General Public License. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with this program; if not, write to the Free Software Foundation, Inc., -// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -//-------------------------------------------------------------------------- -/* - * Description: - * - * Global definitions for the FTPTelnet preprocessor. - * - * NOTES: - * - 16.09.04: Initial Development. SAS - * - * Steven A. Sturges - * Daniel J. Roelker - * Marc A. Norton - */ -#ifndef FTPP_INCLUDE_H -#define FTPP_INCLUDE_H - -#include "main/snort_types.h" -#include "main/snort_debug.h" -#include "sfip/sf_ip.h" -#include "protocols/packet.h" - -#define GENERATOR_SPP_FTPP_FTP 125 -#define GENERATOR_SPP_FTPP_TELNET 126 - -#endif - diff --git a/src/service_inspectors/ftp_telnet/ftpp_return_codes.h b/src/service_inspectors/ftp_telnet/ftpp_return_codes.h index 850dca76b..e2bca4207 100644 --- a/src/service_inspectors/ftp_telnet/ftpp_return_codes.h +++ b/src/service_inspectors/ftp_telnet/ftpp_return_codes.h @@ -35,8 +35,6 @@ #ifndef FTPP_RETURN_CODES_H #define FTPP_RETURN_CODES_H -#include "ftpp_include.h" - #define FTPP_BOOL_FALSE 0 #define FTPP_SUCCESS 0 diff --git a/src/service_inspectors/ftp_telnet/ftpp_si.cc b/src/service_inspectors/ftp_telnet/ftpp_si.cc index 6f8687686..9c182a90b 100644 --- a/src/service_inspectors/ftp_telnet/ftpp_si.cc +++ b/src/service_inspectors/ftp_telnet/ftpp_si.cc @@ -44,15 +44,10 @@ */ #include "ftpp_si.h" -#include -#include -#include -# include - -#include "ftpp_return_codes.h" -#include "ftpp_ui_config.h" #include "ft_main.h" -#include "stream/stream_api.h" +#include "ftpp_return_codes.h" + +#include "sfip/sf_ip.h" #include "utils/util.h" unsigned FtpFlowData::flow_id = 0; diff --git a/src/service_inspectors/ftp_telnet/ftpp_si.h b/src/service_inspectors/ftp_telnet/ftpp_si.h index fc6948b08..b0b36639f 100644 --- a/src/service_inspectors/ftp_telnet/ftpp_si.h +++ b/src/service_inspectors/ftp_telnet/ftpp_si.h @@ -38,7 +38,6 @@ #include -#include "ftpp_include.h" #include "ftpp_ui_config.h" #include "ftp_client.h" #include "ftp_server.h" diff --git a/src/service_inspectors/ftp_telnet/ftpp_ui_config.cc b/src/service_inspectors/ftp_telnet/ftpp_ui_config.cc index 7c324375d..3d030eaf1 100644 --- a/src/service_inspectors/ftp_telnet/ftpp_ui_config.cc +++ b/src/service_inspectors/ftp_telnet/ftpp_ui_config.cc @@ -33,15 +33,11 @@ */ #include "ftpp_ui_config.h" -#include -#include -#include -#include - -#include "utils/util.h" -#include "ftpp_return_codes.h" -#include "ftp_cmd_lookup.h" #include "ftp_bounce_lookup.h" +#include "ftp_cmd_lookup.h" +#include "ftpp_return_codes.h" + +#include "utils/util.h" FTP_CLIENT_PROTO_CONF::FTP_CLIENT_PROTO_CONF() { diff --git a/src/service_inspectors/ftp_telnet/ftpp_ui_config.h b/src/service_inspectors/ftp_telnet/ftpp_ui_config.h index 5cfd02abb..5711fb9f4 100644 --- a/src/service_inspectors/ftp_telnet/ftpp_ui_config.h +++ b/src/service_inspectors/ftp_telnet/ftpp_ui_config.h @@ -38,7 +38,6 @@ #ifndef FTPP_UI_CONFIG_H #define FTPP_UI_CONFIG_H -#include "ftpp_include.h" #include "framework/bits.h" #include "sfip/sfip_t.h" #include "sfrt/sfrt.h" diff --git a/src/service_inspectors/ftp_telnet/pp_ftp.cc b/src/service_inspectors/ftp_telnet/pp_ftp.cc index adcd74fed..a5c1f4cd8 100644 --- a/src/service_inspectors/ftp_telnet/pp_ftp.cc +++ b/src/service_inspectors/ftp_telnet/pp_ftp.cc @@ -40,23 +40,16 @@ #include "config.h" #endif -#include -#include -#include -#include - -#include "pp_telnet.h" -#include "ftp_module.h" #include "ft_main.h" -#include "ftpp_return_codes.h" -#include "ftp_cmd_lookup.h" #include "ftp_bounce_lookup.h" +#include "ftp_cmd_lookup.h" +#include "ftp_module.h" +#include "ftpp_return_codes.h" +#include "pp_telnet.h" -#include "main/snort_debug.h" -#include "stream/stream_api.h" #include "detection/detection_util.h" -#include "sfip/sfip_t.h" #include "file_api/file_service.h" +#include "sfip/sf_ip.h" #ifndef MAXHOSTNAMELEN /* Why doesn't Windows define this? */ #define MAXHOSTNAMELEN 256 diff --git a/src/service_inspectors/ftp_telnet/pp_telnet.cc b/src/service_inspectors/ftp_telnet/pp_telnet.cc index a8da41819..9148190fe 100644 --- a/src/service_inspectors/ftp_telnet/pp_telnet.cc +++ b/src/service_inspectors/ftp_telnet/pp_telnet.cc @@ -47,13 +47,9 @@ #include "config.h" #endif -#include - -#include "telnet_module.h" #include "ftpp_return_codes.h" +#include "telnet_module.h" -#include "main/snort_debug.h" -#include "stream/stream_api.h" #include "detection/detection_util.h" #define NUL 0x00 diff --git a/src/service_inspectors/ftp_telnet/telnet.cc b/src/service_inspectors/ftp_telnet/telnet.cc index 812dedf17..1da8a91d8 100644 --- a/src/service_inspectors/ftp_telnet/telnet.cc +++ b/src/service_inspectors/ftp_telnet/telnet.cc @@ -23,28 +23,16 @@ #include "config.h" #endif -#include -#include -#include -#include - -#include "pp_telnet.h" -#include "ftpp_si.h" -#include "ftpp_ui_config.h" -#include "ftpp_return_codes.h" #include "ft_main.h" #include "ftp_print.h" +#include "ftpp_return_codes.h" +#include "ftpp_si.h" +#include "ftpp_ui_config.h" +#include "pp_telnet.h" #include "telnet_module.h" #include "log/messages.h" -#include "main/snort_types.h" -#include "main/snort_debug.h" #include "profiler/profiler.h" -#include "stream/stream_api.h" -#include "file_api/file_api.h" -#include "parser/parser.h" -#include "framework/inspector.h" -#include "utils/sfsnprintfappend.h" THREAD_LOCAL ProfileStats telnetPerfStats; THREAD_LOCAL SimpleStats tnstats; diff --git a/src/service_inspectors/ftp_telnet/telnet_module.cc b/src/service_inspectors/ftp_telnet/telnet_module.cc index 07445874b..bba8cf592 100644 --- a/src/service_inspectors/ftp_telnet/telnet_module.cc +++ b/src/service_inspectors/ftp_telnet/telnet_module.cc @@ -19,7 +19,6 @@ // telnet_module.cc author Russ Combs #include "telnet_module.h" -#include using namespace std;