From: Priyanka Bangalore Gurudev (prbg) Date: Mon, 4 Dec 2023 19:55:20 +0000 (+0000) Subject: Pull request #4123: build: generate and tag 3.1.76.0 X-Git-Tag: 3.1.76.0^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f87314359ee6cedf1ff07360a0d8cd9308705130;p=thirdparty%2Fsnort3.git Pull request #4123: build: generate and tag 3.1.76.0 Merge in SNORT/snort3 from ~PRBG/snort3:build_3.1.76.0 to master Squashed commit of the following: commit 166c30f1a73c583d0fb615872328c5dc782ef1a2 Author: Priyanka Gurudev Date: Sun Dec 3 23:09:32 2023 -0500 build: generate and tag 3.1.76.0 --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 8ad151906..ceb70d8aa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ project (snort CXX C) set (VERSION_MAJOR 3) set (VERSION_MINOR 1) -set (VERSION_PATCH 75) +set (VERSION_PATCH 76) set (VERSION_SUBLEVEL 0) set (VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_SUBLEVEL}") diff --git a/ChangeLog.md b/ChangeLog.md index 314b471a0..efb9789d4 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,14 @@ +2023-12-03: 3.1.76.0 + +* appid: added missed cppcheck warning +* appid: adding support for memory profiling of third party lib +* appid: additional check for lua logging +* appid: fixing coverity issues +* dns: fix parsing 'additionals' section in dns response +* flow_cache: added new protocol base counters +* pegs: make add_peg_count and set_peg_count protected to be available for the derived class +* perf_mon: fix variable name issue reported by cppcheck + 2023-11-19: 3.1.75.0 * appid: add appId for DNS over QUIC and DNS over HTTP/3 to application_ids.h diff --git a/doc/reference/snort_reference.text b/doc/reference/snort_reference.text index 9301039e0..f7de7c942 100644 --- a/doc/reference/snort_reference.text +++ b/doc/reference/snort_reference.text @@ -8,7 +8,7 @@ Snort 3 Reference Manual The Snort Team Revision History -Revision 3.1.75.0 2023-11-19 20:04:04 EST TST +Revision 3.1.76.0 2023-12-03 22:56:58 EST TST --------------------------------------------------------------------- @@ -5660,6 +5660,34 @@ Peg counts: config reloads (sum) * stream.reload_offloaded_deletes: number of offloaded flows deleted by config reloads (sum) + * stream.ip_timeout_prunes: number of IP flows pruned due to + timeout (sum) + * stream.tcp_timeout_prunes: number of TCP flows pruned due to + timeout (sum) + * stream.udp_timeout_prunes: number of UDP flows pruned due to + timeout (sum) + * stream.icmp_timeout_prunes: number of ICMP flows pruned due to + timeout (sum) + * stream.user_timeout_prunes: number of USER flows pruned due to + timeout (sum) + * stream.file_timeout_prunes: number of FILE flows pruned due to + timeout (sum) + * stream.pdu_timeout_prunes: number of PDU flows pruned due to + timeout (sum) + * stream.ip_memcap_prunes: number of IP flows pruned due to memcap + (sum) + * stream.tcp_memcap_prunes: number of TCP flows pruned due to + memcap (sum) + * stream.udp_memcap_prunes: number of UDP flows pruned due to + memcap (sum) + * stream.icmp_memcap_prunes: number of ICMP flows pruned due to + memcap (sum) + * stream.user_memcap_prunes: number of USER flows pruned due to + memcap (sum) + * stream.file_memcap_prunes: number of FILE flows pruned due to + memcap (sum) + * stream.pdu_memcap_prunes: number of PDU flows pruned due to + memcap (sum) * stream.current_flows: current number of flows in cache (now) * stream.uni_flows: number of uni flows in cache (now) * stream.uni_ip_flows: number of uni ip flows in cache (now) @@ -12099,13 +12127,21 @@ libraries see the Getting Started section of the manual. (sum) * stream.expected_pruned: number of expected flows pruned (sum) * stream.expected_realized: number of expected flows realized (sum) + * stream.file_memcap_prunes: number of FILE flows pruned due to + memcap (sum) + * stream.file_timeout_prunes: number of FILE flows pruned due to + timeout (sum) * stream.flows: total sessions (sum) * stream.ha_prunes: sessions pruned by high availability sync (sum) * stream_icmp.created: icmp session trackers created (sum) * stream_icmp.max: max icmp sessions (max) + * stream.icmp_memcap_prunes: number of ICMP flows pruned due to + memcap (sum) * stream_icmp.prunes: icmp session prunes (sum) * stream_icmp.released: icmp session trackers released (sum) * stream_icmp.sessions: total icmp sessions (sum) + * stream.icmp_timeout_prunes: number of ICMP flows pruned due to + timeout (sum) * stream_icmp.timeouts: icmp session timeouts (sum) * stream.idle_prunes_max_flows: sessions pruned due to pruning timeout since max flows is reached (sum) @@ -12121,6 +12157,8 @@ libraries see the Getting Started section of the manual. * stream_ip.frag_timeouts: datagrams abandoned (sum) * stream_ip.max_frags: max fragments (sum) * stream_ip.max: max ip sessions (max) + * stream.ip_memcap_prunes: number of IP flows pruned due to memcap + (sum) * stream_ip.nodes_deleted: fragments deleted from tracker (sum) * stream_ip.nodes_inserted: fragments added to tracker (sum) * stream_ip.overlaps: overlapping fragments (sum) @@ -12129,6 +12167,8 @@ libraries see the Getting Started section of the manual. * stream_ip.reassembled: reassembled datagrams (sum) * stream_ip.released: ip session trackers released (sum) * stream_ip.sessions: total ip sessions (sum) + * stream.ip_timeout_prunes: number of IP flows pruned due to + timeout (sum) * stream_ip.timeouts: ip session timeouts (sum) * stream_ip.total_bytes: total number of bytes processed (sum) * stream_ip.total_frags: total fragments (sum) @@ -12137,6 +12177,10 @@ libraries see the Getting Started section of the manual. * stream_ip.trackers_completed: datagram trackers completed (sum) * stream_ip.trackers_freed: datagram trackers released (sum) * stream.memcap_prunes: sessions pruned due to memcap (sum) + * stream.pdu_memcap_prunes: number of PDU flows pruned due to + memcap (sum) + * stream.pdu_timeout_prunes: number of PDU flows pruned due to + timeout (sum) * stream.reload_allowed_deletes: number of allowed flows deleted by config reloads (sum) * stream.reload_blocked_deletes: number of blocked flows deleted by @@ -12205,6 +12249,8 @@ libraries see the Getting Started section of the manual. simultaneously (max) * stream_tcp.max_segs: maximum number of segments queued in any flow (max) + * stream.tcp_memcap_prunes: number of TCP flows pruned due to + memcap (sum) * stream_tcp.memory: current memory in use (now) * stream_tcp.meta_acks: number of meta acks processed (sum) * stream_tcp.no_flags_set: tcp packets received with no TCP flags @@ -12244,6 +12290,8 @@ libraries see the Getting Started section of the manual. (sum) * stream_tcp.three_way_trackers: tcp session tracking started on ack (sum) + * stream.tcp_timeout_prunes: number of TCP flows pruned due to + timeout (sum) * stream_tcp.timeouts: tcp session timeouts (sum) * stream_tcp.untracked: tcp packets not tracked (sum) * stream_tcp.zero_len_tcp_opt: number of zero length tcp options @@ -12254,14 +12302,22 @@ libraries see the Getting Started section of the manual. * stream_udp.created: udp session trackers created (sum) * stream_udp.ignored: udp packets ignored (sum) * stream_udp.max: max udp sessions (max) + * stream.udp_memcap_prunes: number of UDP flows pruned due to + memcap (sum) * stream_udp.prunes: udp session prunes (sum) * stream_udp.released: udp session trackers released (sum) * stream_udp.sessions: total udp sessions (sum) + * stream.udp_timeout_prunes: number of UDP flows pruned due to + timeout (sum) * stream_udp.timeouts: udp session timeouts (sum) * stream_udp.total_bytes: total number of bytes processed (sum) * stream.uni_flows: number of uni flows in cache (now) * stream.uni_ip_flows: number of uni ip flows in cache (now) * stream.uni_prunes: uni sessions pruned (sum) + * stream.user_memcap_prunes: number of USER flows pruned due to + memcap (sum) + * stream.user_timeout_prunes: number of USER flows pruned due to + timeout (sum) * tcp.bad_tcp4_checksum: nonzero tcp over ip checksums (sum) * tcp.bad_tcp6_checksum: nonzero tcp over ipv6 checksums (sum) * tcp.checksum_bypassed: checksum calculations bypassed (sum) diff --git a/doc/upgrade/snort_upgrade.text b/doc/upgrade/snort_upgrade.text index 132d6abfe..dd43481a1 100644 --- a/doc/upgrade/snort_upgrade.text +++ b/doc/upgrade/snort_upgrade.text @@ -8,7 +8,7 @@ Snort 3 Upgrade Manual The Snort Team Revision History -Revision 3.1.75.0 2023-11-19 20:04:52 EST TST +Revision 3.1.76.0 2023-12-03 22:58:05 EST TST --------------------------------------------------------------------- diff --git a/doc/user/snort_user.text b/doc/user/snort_user.text index bfd36a403..28717da00 100644 --- a/doc/user/snort_user.text +++ b/doc/user/snort_user.text @@ -8,7 +8,7 @@ Snort 3 User Manual The Snort Team Revision History -Revision 3.1.75.0 2023-11-19 20:04:20 EST TST +Revision 3.1.76.0 2023-12-03 22:57:21 EST TST ---------------------------------------------------------------------