Merge pull request #507 in SNORT/snort3 from ~MIALTIZE/snort3:for-russ-trivial to...

Squashed commit of the following:

commit f17556d34c5ef087e95a99b30708d9ec8910166e
Author: Michael Altizer <mialtize@cisco.com>
Date:   Wed Jun 8 16:44:08 2016 -0400

    extra: Make autotools build quiet again and remove extraneous semicolon.

commit c6ee6b94802b40a31d915e8ce801694a0bd5c845
Author: Michael Altizer <mialtize@cisco.com>
Date:   Wed Jun 8 16:38:14 2016 -0400

    flow: Clarify key hashing function

commit f671d582019fa905ca8fc4419d9a787512259b2d
Author: Michael Altizer <mialtize@cisco.com>
Date:   Wed Jun 8 16:37:43 2016 -0400

    dce_rpc: Fix missing prototype compiler warnings

commit dd24d4b4ebbd12466557624164d24e6c7c3e2548
Author: Michael Altizer <mialtize@cisco.com>
Date:   Tue Jun 7 15:20:03 2016 -0400

    ftp_telnet: Clean up includes

commit fbfc06f05247d53d9aa6f15e3191e6eb3c4f3bdd
Author: Michael Altizer <mialtize@cisco.com>
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 5d2afa5ebe8891bbd1f937efb152be5865f5cc6a..d2c73acf735abbdaeed5c92f28ea8eadedece01b 100644 (file)
--- 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 a0a77f9fbeec367c7c5f6e24c0377b6fd174fd0a..d9340c7f9dbe1983e2031a834d3f6d7e7652eb62 100644 (file)
--- 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 019c9c885c4c4e62f08a1df132c19d640047d353..5daa5435e33326c243043de47663fbcc79694503 100644 (file)
--- 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 33b9899c22605b4161d16900467be844f8419e68..d7f6a8f9226d495692ff6afde3b5fd692cbafe4c 100644 (file)
--- 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 151ca6c575dba87bc35279ffc61faaf40e16c695..29a7b9b82701849c2f36ddae43196b4d492e2848 100644 (file)
--- 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 cc1dc8cc9da96180fdaaa63635aa57504ab8f0fc..6bf504205fd4e6ea3c805198d6a4d8f9ad978f81 100644 (file)
--- 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 4f4dd8b801aab0166d50b13bea2eb4f2864bd624..d15d670ab7e76275d795a574ef47eb98b2b128e3 100644 (file)
--- 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 3c220e6e61d79488add9c9af703d0d89e1222d1d..4632a7c9203f85bcfe40967af1e94af58e3eee0d 100644 (file)
--- 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 <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-#include <errno.h>
-
 #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 306e37d4b48b157e48a19a7b5a433e4970ed2ee5..61ee0f8fa5002b57beb84898bb584227832648de 100644 (file)
--- 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 93e5bab5b26614e694b91af4cac5f3929374808a..25afbdc5bab243fd37c4b34d902b53d9702eb466 100644 (file)
--- 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 <assert.h>
-#include <string.h>
-#include <stdio.h>
-#include <sys/types.h>
-
 #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 75bc46329acca4fb5c0c9983e9ed893b946cce72..835e4e7bfab7150dfbb9cc41715b982cd1282c85 100644 (file)
--- 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 <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#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 3fc569f8978bd4990702b2b9cfe81eaf080fa137..4133aad7af272e2234c0ffdab7b23521594d610b 100644 (file)
--- 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 5fd97dbd26b889f894459a2093da0c8bc4b7238a..264e2357af83104c48d9714ae10cebea5c321ca2 100644 (file)
--- 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 <sys/types.h>
-#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 5642dd5b2b27afafa6ab27dd56d0f4fd2620022f..9279413a6d638e0cee2421cc2841beb664830e68 100644 (file)
--- 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 <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#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 1037c846118dcbc285a9fe0cf64b203e12d90048..868fd4b1e64b21ba405cf203e5ba1415fbda3a72 100644 (file)
--- 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 d56b3c7a2d8d0b319da377b592c0c46f4d08e0f6..59a884ce38bb0a522004748f8e0067f75dcc870a 100644 (file)
--- 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 <assert.h>
-#include <string.h>
-#include <stdio.h>
-#include <sys/types.h>
-
 #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 75fe77219c20da0c528458344bdd4c58cb022ca9..dbb69f3ec01c116db2270869ce87e72373ab1052 100644 (file)
--- a/src/service_inspectors/ftp_telnet/ftp_module.cc
+++ b/src/service_inspectors/ftp_telnet/ftp_module.cc
@@ -23,7 +23,6 @@
 #include <sstream>
 
 #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 bbbe6a6844bb63f8f17d12b98fb8e0fbd69c11f6..402ae2ea9e840e1c61ae58f2f1971ba50331f6d5 100644 (file)
--- 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 <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-#include <errno.h>
-
-#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 798a7b4ecb762e766c6634dd163b2f5e60650ee1..c7934da64cda81fe08458b00746c4d3af62fa466 100644 (file)
--- 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 <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-#include <errno.h>
-
-#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 fb428384d8e96c3ff523e69b1798023287b53309..f2038731c637e409a26ec35dbd1cb3486acbea1d 100644 (file)
--- 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 9e5de332ac2611cbbcc4aaf0677fc0750f69b760..020de9cc8bec80f759b691a02c97a0bb8731f70b 100644 (file)
--- 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 <rucombs@cisco.com>
 
 #include "ftp_splitter.h"
+
 #include <string.h>
 
 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 (file)
index 5004f7e..0000000
--- 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 <ssturges@sourcefire.com>
- * Daniel J. Roelker <droelker@sourcefire.com>
- * Marc A. Norton <mnorton@sourcefire.com>
- */
-#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 850dca76baff50fc6270cdf109c1263c7f503645..e2bca42074707e0ee7d810cd30c20706870b92fd 100644 (file)
--- 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 6f8687686328310a708bb7e4952988efe0efd10d..9c182a90b8ca91d17cc173d6b9aa13409a843829 100644 (file)
--- 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 <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-# include <ctype.h>
-
-#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 fc6948b087a29886b613ef4f1b2cea51901ea10e..b0b36639f85abaf7d548a4d7f738a5a332f249d4 100644 (file)
--- a/src/service_inspectors/ftp_telnet/ftpp_si.h
+++ b/src/service_inspectors/ftp_telnet/ftpp_si.h
@@ -38,7 +38,6 @@
 
 #include <stdint.h>
 
-#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 7c324375db0ee8998cdee88074188a2728103f7a..3d030eaf1e431434eba9a85063a8733c8aa142fe 100644 (file)
--- 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 <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
- 
-#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 5cfd02abb4ae90dc119a52873750b5fdae89d208..5711fb9f455023c56383f7fb8f9ac69d5080d9cc 100644 (file)
--- 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 adcd74fedf8c1edd600d28ad86ecc8d3ed2cd89a..a5c1f4cd8d7821a24782f5d8084d728d062fc840 100644 (file)
--- 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 <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/types.h>
-
-#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 a8da4181943d38fa27eba2954f3161b67e7c0762..9148190fe80dbf48e039c753952a880a425735a3 100644 (file)
--- 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 <sys/types.h>
-
-#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 812dedf17cef49606e8552ca8ca6e90b4cbe7336..1da8a91d8c5998a8d0735f0c445a32c5225f01ed 100644 (file)
--- 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 <assert.h>
-#include <string.h>
-#include <stdio.h>
-#include <sys/types.h>
-
-#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 07445874b3aebcfdf94820b25346757f57e13794..bba8cf592d466a6f7a71d701e43b34028515abc8 100644 (file)
--- 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 <rucombs@cisco.com>
 
 #include "telnet_module.h"
-#include <sstream>
 
 using namespace std;