From: Michael Altizer (mialtize) Date: Tue, 21 Jan 2020 03:04:07 +0000 (+0000) Subject: Merge pull request #1946 in SNORT/snort3 from ~SELYSENK/snort3:bug/362106 to master X-Git-Tag: 3.0.0-268~47 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa2b44d03c846735ff00495d5b7e31daa2bdc90c;p=thirdparty%2Fsnort3.git Merge pull request #1946 in SNORT/snort3 from ~SELYSENK/snort3:bug/362106 to master Squashed commit of the following: commit 47f108c7be1b3aca7ff8a0b238ca997c469ffbde Author: Serhii Lysenko Date: Fri Jan 17 15:18:21 2020 +0200 cip: explicitly include sys/time.h header commit 51d311de1b4f34931b017529ff382ae2a79b7cba Author: Serhii Lysenko Date: Fri Jan 17 18:24:31 2020 +0200 rna: use standard uint8_t type instead of u_int8_t --- diff --git a/src/host_tracker/host_tracker.cc b/src/host_tracker/host_tracker.cc index ecf9d7843..012408225 100644 --- a/src/host_tracker/host_tracker.cc +++ b/src/host_tracker/host_tracker.cc @@ -46,7 +46,7 @@ void HostTracker::update_last_event(uint32_t time) last_event = time ? time : last_seen; } -bool HostTracker::add_mac(const u_int8_t* mac, u_int8_t ttl, u_int8_t primary) +bool HostTracker::add_mac(const uint8_t* mac, uint8_t ttl, uint8_t primary) { if ( !mac or !memcmp(mac, zero_mac, MAC_SIZE) ) return false; @@ -130,7 +130,7 @@ static inline string to_time_string(uint32_t p_time) return buffer; } -static inline string to_mac_string(const u_int8_t* mac) +static inline string to_mac_string(const uint8_t* mac) { char mac_addr[18]; snprintf(mac_addr, 18, "%02X:%02X:%02X:%02X:%02X:%02X", diff --git a/src/host_tracker/host_tracker.h b/src/host_tracker/host_tracker.h index 60d6ce309..149283686 100644 --- a/src/host_tracker/host_tracker.h +++ b/src/host_tracker/host_tracker.h @@ -53,13 +53,13 @@ extern const uint8_t zero_mac[MAC_SIZE]; struct HostMac { - HostMac(u_int8_t p_ttl, const u_int8_t* p_mac, u_int8_t p_primary, uint32_t p_last_seen) + HostMac(uint8_t p_ttl, const uint8_t* p_mac, uint8_t p_primary, uint32_t p_last_seen) : ttl(p_ttl), primary(p_primary), last_seen (p_last_seen) { memcpy(mac, p_mac, MAC_SIZE); } // the type and order below should match logger's serialization - u_int8_t ttl; - u_int8_t mac[MAC_SIZE]; - u_int8_t primary; + uint8_t ttl; + uint8_t mac[MAC_SIZE]; + uint8_t primary; uint32_t last_seen; }; @@ -98,7 +98,7 @@ public: } // Returns true if a new mac entry is added, false otherwise - bool add_mac(const u_int8_t* mac, u_int8_t ttl, u_int8_t primary); + bool add_mac(const uint8_t* mac, uint8_t ttl, uint8_t primary); // The caller owns and deletes the copied list of mac addresses void copy_data(uint8_t& p_hops, uint32_t& p_last_seen, std::list*& p_macs); diff --git a/src/host_tracker/test/host_tracker_test.cc b/src/host_tracker/test/host_tracker_test.cc index 9ac2b1fe3..01b05129d 100644 --- a/src/host_tracker/test/host_tracker_test.cc +++ b/src/host_tracker/test/host_tracker_test.cc @@ -81,7 +81,7 @@ TEST(host_tracker, copy_data_test) { test_time = 1562198400; HostTracker ht; - u_int8_t mac[6] = {254, 237, 222, 173, 190, 239}; + uint8_t mac[6] = {254, 237, 222, 173, 190, 239}; ht.add_mac(mac, 50, 1); uint8_t p_hops = 0; @@ -107,8 +107,8 @@ TEST(host_tracker, stringify) test_time = 1562198400; // this time will be updated and should not be seen in stringify HostTracker ht; - u_int8_t mac1[6] = {254, 237, 222, 173, 190, 239}; - u_int8_t mac2[6] = {202, 254, 192, 255, 238, 0}; + uint8_t mac1[6] = {254, 237, 222, 173, 190, 239}; + uint8_t mac2[6] = {202, 254, 192, 255, 238, 0}; test_time = 1562198404; // this time should be the time of the first mac address ht.update_last_seen(); ht.add_mac(mac1, 9, 0); diff --git a/src/network_inspectors/rna/rna_logger.cc b/src/network_inspectors/rna/rna_logger.cc index bd1708ddb..fe750c9d6 100644 --- a/src/network_inspectors/rna/rna_logger.cc +++ b/src/network_inspectors/rna/rna_logger.cc @@ -36,7 +36,7 @@ using namespace snort; bool RnaLogger::log(uint16_t type, uint16_t subtype, const Packet* p, RnaTracker* ht, - const struct in6_addr* src_ip, const u_int8_t* src_mac, uint32_t event_time, + const struct in6_addr* src_ip, const uint8_t* src_mac, uint32_t event_time, void* cond_var) { if ( !enabled ) diff --git a/src/network_inspectors/rna/rna_logger.h b/src/network_inspectors/rna/rna_logger.h index 0b72de6af..a8e984e09 100644 --- a/src/network_inspectors/rna/rna_logger.h +++ b/src/network_inspectors/rna/rna_logger.h @@ -34,11 +34,11 @@ using RnaTracker = std::shared_ptr; struct RnaLoggerEvent : public Event { RnaLoggerEvent(uint16_t p_type, uint16_t p_subtype, const RnaTracker* p_ht, - const u_int8_t* p_mac) : type(p_type), subtype(p_subtype), ht(p_ht), mac(p_mac) { } + const uint8_t* p_mac) : type(p_type), subtype(p_subtype), ht(p_ht), mac(p_mac) { } uint16_t type; uint16_t subtype; const RnaTracker* ht; - const u_int8_t* mac; + const uint8_t* mac; const struct in6_addr* ip; void* cond_var = nullptr; }; @@ -48,7 +48,7 @@ class RnaLogger public: RnaLogger(const bool enable) : enabled(enable) { } bool log(uint16_t type, uint16_t subtype, const snort::Packet* p, RnaTracker* ht, - const struct in6_addr* src_ip, const u_int8_t* src_mac, + const struct in6_addr* src_ip, const uint8_t* src_mac, uint32_t event_time = 0, void* cond_var = nullptr); private: diff --git a/src/network_inspectors/rna/rna_pnd.cc b/src/network_inspectors/rna/rna_pnd.cc index 1dd6c5ecd..f74ac4c9c 100644 --- a/src/network_inspectors/rna/rna_pnd.cc +++ b/src/network_inspectors/rna/rna_pnd.cc @@ -141,7 +141,7 @@ void RnaPnd::discover_network_udp(const Packet* p) discover_network(p, ip_api.ttl()); } -void RnaPnd::discover_network(const Packet* p, u_int8_t ttl) +void RnaPnd::discover_network(const Packet* p, uint8_t ttl) { bool new_host = false; const auto& src_ip = p->ptrs.ip_api.get_src(); diff --git a/src/network_inspectors/rna/rna_pnd.h b/src/network_inspectors/rna/rna_pnd.h index 5abe5d6b1..e00bf1520 100644 --- a/src/network_inspectors/rna/rna_pnd.h +++ b/src/network_inspectors/rna/rna_pnd.h @@ -62,7 +62,7 @@ private: void discover_network_non_ip(const snort::Packet* p); void discover_network_tcp(const snort::Packet* p); void discover_network_udp(const snort::Packet* p); - void discover_network(const snort::Packet* p, u_int8_t ttl); + void discover_network(const snort::Packet* p, uint8_t ttl); RnaLogger logger; DiscoveryFilter filter; diff --git a/src/service_inspectors/cip/cip_definitions.h b/src/service_inspectors/cip/cip_definitions.h index b9bba15f9..0cda06ca2 100644 --- a/src/service_inspectors/cip/cip_definitions.h +++ b/src/service_inspectors/cip/cip_definitions.h @@ -23,6 +23,8 @@ #ifndef CIP_DEFINITIONS_H #define CIP_DEFINITIONS_H +#include + namespace snort { struct Packet;