Merge pull request #2150 in SNORT/snort3 from ~MIALTIZE/snort3:kill_inspectordata...

Squashed commit of the following:

commit 55c887b65e3e21401ec64eb80b647ea5dfb6b4f5
Author: Michael Altizer <mialtize@cisco.com>
Date:   Fri Apr 10 12:56:52 2020 -0400

    framework: Remove unused InspectorData template

    Reimplement the only prior user (FtpClient) without the template.

diff --git a/src/framework/inspector.h b/src/framework/inspector.h
index d7b4e4ffb7c420375592e988a3f881db66b5772b..d6dffc84c9810ff6c7c69f91bd9e7f018ac83342 100644 (file)
--- a/src/framework/inspector.h
+++ b/src/framework/inspector.h
@@ -150,22 +150,6 @@ private:
     SnortProtocolId snort_protocol_id;
 };
 
-template <typename T>
-class InspectorData : public Inspector
-{
-public:
-    InspectorData(T* t)
-    { data = t; }
-
-    ~InspectorData() override
-    { delete data; }
-
-    void show(SnortConfig*) override { }
-    void eval(Packet*) override { }
-
-    T* data;
-};
-
 // at present there is no sequencing among like types except that appid
 // is always first among controls.
 

diff --git a/src/service_inspectors/ftp_telnet/ftp.cc b/src/service_inspectors/ftp_telnet/ftp.cc
index 4715fd6599ab636e78c4a55ec4ae6f9600197509..6ece3faa094ddd8471966fa6506bbd481b9a7775 100644 (file)
--- a/src/service_inspectors/ftp_telnet/ftp.cc
+++ b/src/service_inspectors/ftp_telnet/ftp.cc
@@ -186,13 +186,24 @@ static int snort_ftp(Packet* p)
 // class stuff
 //-------------------------------------------------------------------------
 
-typedef InspectorData<FTP_CLIENT_PROTO_CONF> FtpClient;
+class FtpClient : public Inspector
+{
+public:
+    FtpClient(FTP_CLIENT_PROTO_CONF* client) : ftp_client(client) { }
+
+    ~FtpClient() override
+    { delete ftp_client; }
+
+    void show(SnortConfig*) override;
+    void eval(Packet*) override { }
+
+    FTP_CLIENT_PROTO_CONF* ftp_client;
+};
 
-template<>
 void FtpClient::show(SnortConfig*)
 {
-    if ( data )
-        print_conf_client(data);
+    if ( ftp_client )
+        print_conf_client(ftp_client);
 }
 
 class FtpServer : public Inspector
@@ -258,7 +269,7 @@ FTP_CLIENT_PROTO_CONF* get_ftp_client(Packet* p)
         assert(client);
         p->flow->set_data(client);
     }
-    return client->data;
+    return client->ftp_client;
 }
 
 FTP_SERVER_PROTO_CONF* get_ftp_server(Packet* p)