Merge pull request #806 in SNORT/snort3 from warnings to master

Squashed commit of the following:

commit fd0900c85e4065474274c2d00410af0e0f07659c
Author: Michael Altizer <mialtize@cisco.com>
Date:   Wed Feb 8 12:43:14 2017 -0500

    appid: Remove dead store when USE_RNA_CONFIG isn't defined

commit aaed4212a58227641c7e4e883532990a5a0559dd
Author: Michael Altizer <mialtize@cisco.com>
Date:   Mon Feb 6 11:21:23 2017 -0500

    dce_rpc: Fix compiler warnings in dce_http_server and dce_http_proxy

diff --git a/src/network_inspectors/appid/appid_session.cc b/src/network_inspectors/appid/appid_session.cc
index 5346af0fe6fbb88736aed2a776bfd658a1c4124c..5699cd584c632f981bc75d88cd5e44a839668a6f 100644 (file)
--- a/src/network_inspectors/appid/appid_session.cc
+++ b/src/network_inspectors/appid/appid_session.cc
@@ -1951,7 +1951,9 @@ static inline unsigned get_ipfuncs_flags(const Packet* p, bool dst, AppIdConfig*
 
     if (!dst)
     {
+#ifdef USE_RNA_CONFIG
         zone = p->pkth->ingress_group;
+#endif
         sf_ip = p->ptrs.ip_api.get_src();
     }
     else

diff --git a/src/service_inspectors/dce_rpc/dce_http_proxy.cc b/src/service_inspectors/dce_rpc/dce_http_proxy.cc
index 32172a37c934c75ca8c1f43272f4f04b7cc5cb3a..8cdac05f8e864773d8d367563b20704e2f8399f1 100644 (file)
--- a/src/service_inspectors/dce_rpc/dce_http_proxy.cc
+++ b/src/service_inspectors/dce_rpc/dce_http_proxy.cc
@@ -39,7 +39,7 @@ THREAD_LOCAL DceHttpProxyStats dce_http_proxy_stats;
 class DceHttpProxy : public Inspector
 {
 public:
-    void eval(Packet*) {};
+    void eval(Packet*) override { }
     void clear(Packet*) override;
     StreamSplitter* get_splitter(bool c2s) override
     {

diff --git a/src/service_inspectors/dce_rpc/dce_http_server.cc b/src/service_inspectors/dce_rpc/dce_http_server.cc
index 92c094943afbccf120640c60912de8eca010b94f..7e5c880b5b32e54fd17f15b243690a1c08f5418a 100644 (file)
--- a/src/service_inspectors/dce_rpc/dce_http_server.cc
+++ b/src/service_inspectors/dce_rpc/dce_http_server.cc
@@ -39,7 +39,7 @@ THREAD_LOCAL DceHttpServerStats dce_http_server_stats;
 class DceHttpServer : public Inspector
 {
 public:
-    void eval(Packet*) {};
+    void eval(Packet*) override { }
     void clear(Packet*) override;
     StreamSplitter* get_splitter(bool c2s) override
     {