Merge pull request #2810 in SNORT/snort3 from ~SMINUT/snort3:smbfp_fix to master

Squashed commit of the following:

commit 3fa6d18e0be33f4ebab458f5f690e3149b3d0b0a
Author: Silviu Minut <sminut@cisco.com>
Date:   Tue Mar 23 14:31:33 2021 -0400

    rna: rename minor and major data members to avoid compiler warning

diff --git a/src/network_inspectors/rna/rna_fingerprint_smb.cc b/src/network_inspectors/rna/rna_fingerprint_smb.cc
index 3f25c7942dac0f23b2287a723a965073579c2c77..0c71525a32a104d74ec9cbf7ace33e70118423e3 100644 (file)
--- a/src/network_inspectors/rna/rna_fingerprint_smb.cc
+++ b/src/network_inspectors/rna/rna_fingerprint_smb.cc
@@ -51,7 +51,7 @@ namespace snort
 {
 
 SmbFingerprint::SmbFingerprint(unsigned maj, unsigned min, uint32_t f)
-    : major(maj), minor(min), flags(f) { }
+    : smb_major(maj), smb_minor(min), flags(f) { }
 
 SmbFingerprint::SmbFingerprint(const RawFingerprint& rfp)
 {
@@ -60,8 +60,8 @@ SmbFingerprint::SmbFingerprint(const RawFingerprint& rfp)
     fpuuid = rfp.fpuuid;
     ttl = rfp.ttl;
 
-    major = rfp.smb_major;
-    minor = rfp.smb_minor;
+    smb_major = rfp.smb_major;
+    smb_minor = rfp.smb_minor;
     flags = rfp.smb_flags;
 }
 
@@ -71,8 +71,8 @@ bool SmbFingerprint::operator==(const SmbFingerprint& y) const
         (fp_type == y.fp_type) &&
         (fpuuid == y.fpuuid) &&
         (ttl == y.ttl) &&
-        (major == y.major) &&
-        (minor == y.minor) &&
+        (smb_major == y.smb_major) &&
+        (smb_minor == y.smb_minor) &&
         (flags == y.flags) );
 }
 
@@ -102,14 +102,14 @@ TEST_CASE("get_smb_fp_processor", "[rna_fingerprint_smb]")
     SmbFpProcessor* processor = get_smb_fp_processor();
     CHECK(processor == &smb_processor);
 
-    unsigned major = 6;
-    unsigned minor = 4;
+    unsigned smb_major = 6;
+    unsigned smb_minor = 4;
     uint32_t flags = 4096;
-    SmbFingerprint fp(major, minor, flags);
+    SmbFingerprint fp(smb_major, smb_minor, flags);
     processor->push(fp);
 
     // positive test:
-    const SmbFingerprint* fpptr = processor->find({major, minor, flags});
+    const SmbFingerprint* fpptr = processor->find({smb_major, smb_minor, flags});
     CHECK(fpptr != nullptr);
     CHECK(*fpptr == fp);
 

diff --git a/src/network_inspectors/rna/rna_fingerprint_smb.h b/src/network_inspectors/rna/rna_fingerprint_smb.h
index 6b325f5596b4a4e07e7c22b3db5e20604d278d58..299a9d2597289f2c9a2f86351571113502aef6f3 100644 (file)
--- a/src/network_inspectors/rna/rna_fingerprint_smb.h
+++ b/src/network_inspectors/rna/rna_fingerprint_smb.h
@@ -44,8 +44,8 @@ public:
     SmbFingerprint(unsigned maj = 0, unsigned min = 0, uint32_t f = 0);
     SmbFingerprint(const RawFingerprint& rfp);
 
-    unsigned major;
-    unsigned minor;
+    unsigned smb_major;
+    unsigned smb_minor;
     uint32_t flags;
 
     bool operator==(const SmbFingerprint& y) const;
@@ -59,9 +59,9 @@ public:
     {
         size_t operator()(const SmbFingerprint & key) const noexcept
         {
-            std::hash<decltype(SmbFingerprint::major)> hm;
+            std::hash<decltype(SmbFingerprint::smb_major)> hm;
             std::hash<decltype(SmbFingerprint::flags)> hf;
-            auto const h = hm(key.major) ^ (hm(key.minor) << 1) ^ (hf(key.flags) << 2);
+            auto const h = hm(key.smb_major) ^ (hm(key.smb_minor) << 1) ^ (hf(key.flags) << 2);
             return h;
         }
     };
@@ -70,7 +70,7 @@ public:
     {
         bool operator() (const SmbFingerprint& x, const SmbFingerprint& y) const
         {
-            return x.major == y.major && x.minor == y.minor && x.flags == y.flags;
+            return x.smb_major == y.smb_major && x.smb_minor == y.smb_minor && x.flags == y.flags;
         }
     };
 

diff --git a/src/network_inspectors/rna/rna_pnd.cc b/src/network_inspectors/rna/rna_pnd.cc
index 286dc8399d21cd0c21e5376a515cfd79fe99745d..e0cfeaa5c6915e48a19cfa86670794df0726feb8 100644 (file)
--- a/src/network_inspectors/rna/rna_pnd.cc
+++ b/src/network_inspectors/rna/rna_pnd.cc
@@ -360,11 +360,11 @@ void RnaPnd::analyze_smb_fingerprint(DataEvent& event)
         return;
 
     const FpSMBDataEvent& fp_smb_data_event = static_cast<FpSMBDataEvent&>(event);
-    unsigned major = fp_smb_data_event.get_fp_smb_major();
-    unsigned minor = fp_smb_data_event.get_fp_smb_minor();
+    unsigned smb_major = fp_smb_data_event.get_fp_smb_major();
+    unsigned smb_minor = fp_smb_data_event.get_fp_smb_minor();
     uint32_t flags = fp_smb_data_event.get_fp_smb_flags();
 
-    const SmbFingerprint* fp = processor->find({major, minor, flags});
+    const SmbFingerprint* fp = processor->find({smb_major, smb_minor, flags});
 
     if ( fp && rt->add_smb_fingerprint(fp->fpid) )
     {