Merge pull request #3069 in SNORT/snort3 from ~MASHASAN/snort3:hc_unused to master

Squashed commit of the following:

commit d534f009caa0c3499c835bfd1b93f15b9f077697
Author: Masud Hasan <mashasan@cisco.com>
Date:   Tue Sep 21 10:26:29 2021 -0400

    host_tracker: Removing unused methods

diff --git a/src/host_tracker/host_tracker.cc b/src/host_tracker/host_tracker.cc
index 376246543dd3edf4b70de2c6758dea13fc0a860a..830a76409a9d882e497e0863a6e5c70fbfb77b49 100644 (file)
--- a/src/host_tracker/host_tracker.cc
+++ b/src/host_tracker/host_tracker.cc
@@ -311,24 +311,12 @@ void HostTracker::update_vlan(uint16_t vth_pri_cfi_vlan, uint16_t vth_proto)
     vlan_tag.vth_proto = vth_proto;
 }
 
-bool HostTracker::has_vlan()
-{
-    lock_guard<mutex> lck(host_tracker_lock);
-    return vlan_tag_present;
-}
-
 bool HostTracker::has_same_vlan(uint16_t pvlan)
 {
     lock_guard<mutex> lck(host_tracker_lock);
     return vlan_tag_present and ( vlan_tag.vth_pri_cfi_vlan == pvlan );
 }
 
-uint16_t HostTracker::get_vlan()
-{
-    lock_guard<mutex> lck(host_tracker_lock);
-    return vlan_tag.vth_pri_cfi_vlan;
-}
-
 void HostTracker::get_vlan_details(uint8_t& cfi, uint8_t& priority, uint16_t& vid)
 {
     lock_guard<mutex> lck(host_tracker_lock);

diff --git a/src/host_tracker/host_tracker.h b/src/host_tracker/host_tracker.h
index 9017c3a4ea7c7e0cbe211280349113bf1fc1e0f9..7d0e8401281c5882fa53b3511827cfe3d47f4358 100644 (file)
--- a/src/host_tracker/host_tracker.h
+++ b/src/host_tracker/host_tracker.h
@@ -295,9 +295,7 @@ public:
     const uint8_t* get_last_seen_mac(uint8_t*);
 
     void update_vlan(uint16_t vth_pri_cfi_vlan, uint16_t vth_proto);
-    bool has_vlan();
     bool has_same_vlan(uint16_t);
-    uint16_t get_vlan();
     void get_vlan_details(uint8_t& cfi, uint8_t& priority, uint16_t& vid);
 
     // The caller owns and deletes the copied list of mac addresses