Merge pull request #2560 in SNORT/snort3 from ~OSERHIIE/snort3:wunused_private_field_...

Squashed commit of the following:

commit becffddb7df47b21e89766fee3c1d7b5eadd970c
Author: Oleksandr Serhiienko <oserhiie@cisco.com>
Date:   Wed Oct 21 20:06:58 2020 +0300

    appid: fix -Wunused-private-field Clang warning in service_state.h

diff --git a/src/network_inspectors/appid/service_state.h b/src/network_inspectors/appid/service_state.h
index a29ef4d1124986c7e5344da0f519facf5dbfbbf3..19fbe4432b2890ef2f73d133ea77d4a95fd640c5 100644 (file)
--- a/src/network_inspectors/appid/service_state.h
+++ b/src/network_inspectors/appid/service_state.h
@@ -35,7 +35,7 @@
 
 class ServiceDetector;
 
-class AppIdServiceStateKey;
+struct AppIdServiceStateKey;
 class ServiceDiscoveryState;
 
 typedef std::map<AppIdServiceStateKey, ServiceDiscoveryState*> Map_t;
@@ -161,9 +161,8 @@ public:
 
 
 PADDING_GUARD_BEGIN
-class AppIdServiceStateKey
+struct AppIdServiceStateKey
 {
-public:
     AppIdServiceStateKey(const snort::SfIp* ip,
         IpProtocol proto, uint16_t port, int16_t group, uint16_t asid, bool decrypted) :
         ip(*ip), port(port), group(group), asid(asid), decrypted(decrypted), proto(proto)
@@ -174,7 +173,6 @@ public:
         return memcmp((const uint8_t*) this, (const uint8_t*) &right, sizeof(*this)) < 0;
     }
 
-private:
     snort::SfIp ip;
     uint16_t port;
     int16_t group;