From: Masud Hasan (mashasan) <mashasan@cisco.com>
Date: Tue, 27 Oct 2020 20:18:11 +0000 (+0000)
Subject: Merge pull request #2582 in SNORT/snort3 from ~DAVMCPHE/snort3:rna_host_type_log_mac... 
X-Git-Tag: 3.0.3-5~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82cc27405f513b565e2ed348c0660a5fedc86e4a;p=thirdparty%2Fsnort3.git

Merge pull request #2582 in SNORT/snort3 from ~DAVMCPHE/snort3:rna_host_type_log_mac to master

Squashed commit of the following:

commit 373c4aec7507a879b7564900c0f462a6badc667d
Author: davis mcpherson <davmcphe@cisco.com>
Date:   Fri Oct 23 09:38:39 2020 -0400

    rna: log src mac from packet containing CDP message when host type change event is generated
---

diff --git a/src/network_inspectors/rna/rna_pnd.cc b/src/network_inspectors/rna/rna_pnd.cc
index 4f43af042..7b6510eb2 100644
--- a/src/network_inspectors/rna/rna_pnd.cc
+++ b/src/network_inspectors/rna/rna_pnd.cc
@@ -720,7 +720,7 @@ int RnaPnd::discover_host_types_cdp(const Packet* p, const uint8_t* data, uint16
                 ht->set_host_type(HOST_TYPE_BRIDGE);
 
             logger.log(RNA_EVENT_CHANGE, CHANGE_HOST_TYPE, p, &ht,
-                (const struct in6_addr*)cdp_ip.get_ip6_ptr(), zero_mac);
+                (const struct in6_addr*)cdp_ip.get_ip6_ptr(), layer::get_eth_layer(p)->ether_src);
         }
     }