Merge pull request #612 in SNORT/snort3 from ftp_print_remove to master

Squashed commit of the following:

commit 07e889b0cc3417a2d6a4033cd2617e28a6136c91
Author: Tom Peters <thopeter@cisco.com>
Date:   Fri Sep 2 11:27:59 2016 -0400

    Commented out code related to ftp_config::show()

diff --git a/src/service_inspectors/ftp_telnet/ftp_bounce_lookup.cc b/src/service_inspectors/ftp_telnet/ftp_bounce_lookup.cc
index 835e4e7bfab7150dfbb9cc41715b982cd1282c85..1cbdfde7bb633f25c5de0c9711d7420b5ad0dffe 100644 (file)
--- a/src/service_inspectors/ftp_telnet/ftp_bounce_lookup.cc
+++ b/src/service_inspectors/ftp_telnet/ftp_bounce_lookup.cc
@@ -190,6 +190,8 @@ FTP_BOUNCE_TO* ftp_bounce_lookup_find(
     return BounceTo;
 }
 
+// FIXIT-L orphan code until FTP client inspector acquires a show() method
+#if 0
 /*
  * Function: ftp_bounce_lookup_first(BOUNCE_LOOKUP *BounceLookup,
  *                                   int *iError)
@@ -272,4 +274,5 @@ FTP_BOUNCE_TO* ftp_bounce_lookup_next(BOUNCE_LOOKUP* BounceLookup,
 
     return BounceTo;
 }
+#endif
 

diff --git a/src/service_inspectors/ftp_telnet/ftp_bounce_lookup.h b/src/service_inspectors/ftp_telnet/ftp_bounce_lookup.h
index 4133aad7af272e2234c0ffdab7b23521594d610b..969ac5e9dbdb40caa43b2745150ee67518c86c74 100644 (file)
--- a/src/service_inspectors/ftp_telnet/ftp_bounce_lookup.h
+++ b/src/service_inspectors/ftp_telnet/ftp_bounce_lookup.h
@@ -39,8 +39,9 @@ int ftp_bounce_lookup_cleanup(BOUNCE_LOOKUP** BounceLookup);
 int ftp_bounce_lookup_add(BOUNCE_LOOKUP* BounceLookup, const sfip_t* ip, FTP_BOUNCE_TO* BounceTo);
 
 FTP_BOUNCE_TO* ftp_bounce_lookup_find(BOUNCE_LOOKUP* BounceLookup, const sfip_t* ip, int* iError);
-FTP_BOUNCE_TO* ftp_bounce_lookup_first(BOUNCE_LOOKUP* BounceLookup, int* iError);
-FTP_BOUNCE_TO* ftp_bounce_lookup_next(BOUNCE_LOOKUP* BounceLookup, int* iError);
+// FIXIT-L orphan code until FTP client inspector acquires a show() method
+// FTP_BOUNCE_TO* ftp_bounce_lookup_first(BOUNCE_LOOKUP* BounceLookup, int* iError);
+// FTP_BOUNCE_TO* ftp_bounce_lookup_next(BOUNCE_LOOKUP* BounceLookup, int* iError);
 
 #endif
 

diff --git a/src/service_inspectors/ftp_telnet/ftp_print.cc b/src/service_inspectors/ftp_telnet/ftp_print.cc
index c7934da64cda81fe08458b00746c4d3af62fa466..34273ecb99eef886da91375affeed9aead2245c6 100644 (file)
--- a/src/service_inspectors/ftp_telnet/ftp_print.cc
+++ b/src/service_inspectors/ftp_telnet/ftp_print.cc
@@ -169,6 +169,8 @@ static void PrintCmdFmt(char* buf, FTP_PARAM_FMT* CmdFmt)
         PrintCmdFmt(buf, CmdFmt->next_param_fmt);
 }
 
+// FIXIT-L orphan code until FTP client inspector acquires a show() method
+#if 0
 int PrintFTPClientConf(FTP_CLIENT_PROTO_CONF* ClientConf)
 {
     FTP_BOUNCE_TO* FTPBounce;
@@ -219,6 +221,7 @@ int PrintFTPClientConf(FTP_CLIENT_PROTO_CONF* ClientConf)
 
     return FTPP_SUCCESS;
 }
+#endif
 
 int PrintFTPServerConf(FTP_SERVER_PROTO_CONF* ServerConf)
 {

diff --git a/src/service_inspectors/ftp_telnet/ftp_print.h b/src/service_inspectors/ftp_telnet/ftp_print.h
index fef7941a110fe45e568bd0ebc5ef0605b8d072f5..413140fd5507a213f557e264dbeaa729013f9bf8 100644 (file)
--- a/src/service_inspectors/ftp_telnet/ftp_print.h
+++ b/src/service_inspectors/ftp_telnet/ftp_print.h
@@ -28,7 +28,8 @@
 #include "ftpp_ui_config.h"
 
 int PrintConfOpt(bool on, const char* Option);
-int PrintFTPClientConf(FTP_CLIENT_PROTO_CONF*);
+// FIXIT-L orphan code until FTP client inspector acquires a show() method
+// int PrintFTPClientConf(FTP_CLIENT_PROTO_CONF*);
 int PrintFTPServerConf(FTP_SERVER_PROTO_CONF*);
 
 #endif