Skip to content

Commit 1e24560

Browse files
authored
Merge branch 'snort3:master' into porcupine
2 parents 44fe23d + 7acc98e commit 1e24560

File tree

647 files changed

+8702
-8238
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

647 files changed

+8702
-8238
lines changed

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ project (snort CXX C)
33

44
set (VERSION_MAJOR 3)
55
set (VERSION_MINOR 1)
6-
set (VERSION_PATCH 71)
6+
set (VERSION_PATCH 74)
77
set (VERSION_SUBLEVEL 0)
88
set (VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_SUBLEVEL}")
99

ChangeLog.md

+47
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,50 @@
1+
2023-11-07: 3.1.74.0
2+
3+
* actions, detection, file_api, flow, stream: coverity fixes
4+
* appid: clean up main thread appid debug and make appid on, off, on work
5+
* appid: lua log function with appiddebug check
6+
* build: address miscellaneous cppcheck warnings
7+
* build: fix up 32-bit compilation
8+
* build: fix coverity and cppcheck issues
9+
* build: remove unused functions reported by cppcheck
10+
* codecs: fix bad checksum when auth(51) protocol header is present between IP and TCP layer.
11+
* dce_rpc: added SMB Redesigned Multichannel enabled code
12+
* http_inspect: add correct handling of configuration error
13+
* ips_options: fix ack option
14+
* ips_options: fix flow bits
15+
* packet_io: fix incorrect counters caused by data plane counters reset
16+
* search_tool: allow an override of the search method
17+
* search_tool: fall back to normal mpse if no snort config
18+
19+
2023-10-23: 3.1.73.0
20+
21+
* appid: added support for appid trace logs with multiple logging levels
22+
* appid: fixing cppcheck issue
23+
* control: code refactor to support all unix flavors
24+
* detection: fix cleaning of rule profiling stats when profiling starts
25+
* host_cache: added segmented cache
26+
* http_inspect: handle reserved gzip flags
27+
* http_inspect: response to 0.9 isn't necessarily 0.9
28+
* profiler: extend field length to support uint64
29+
* stream: skip duplicated alerts in TcpReassemblerState's list. Thanks wenhao-in-chengdu for reporting the issue and suggesting a fix.
30+
* stream_tcp: ignore normalization checks when in midstream state
31+
32+
2023-10-10: 3.1.72.0
33+
34+
* active: added API for printing delayed action string
35+
* appid: support to get correct http session based on stream_id
36+
* control: allow one command at a time
37+
* dce_rpc: using reset_using_rpkt() inline to what is there in eval() of SMB inspector code as well
38+
* flow_cache: added protocol base LRU caches
39+
* helpers: increase buffer space for function names, allow printing truncated names
40+
* http_inspect: clear fake headers snapshot for 0.9 response
41+
* http_inspect: run detection on failed utf decoding
42+
* memory: change NOW type counts to SUM type, where necessary
43+
* packet_io: fix daq stats
44+
* stream_tcp: accept 1 byte of trimmed probe data after zero window
45+
* stream_tcp: update rcv_nxt appropriately for each segment
46+
* tcp: timeout for embryonic and idle session
47+
148
2023-09-25: 3.1.71.0
249

350
* appid, http_inspect, http2_inspect: create appid session if not present in decrypt event handler, add message section as part of StreamFlowIntf for httpx

cmake/FindDAQ.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ This module defines:
1616
#]=======================================================================]
1717

1818
find_package(PkgConfig)
19-
pkg_check_modules(PC_DAQ libdaq>=3.0.12)
19+
pkg_check_modules(PC_DAQ libdaq>=3.0.13)
2020

2121
# Use DAQ_INCLUDE_DIR_HINT and DAQ_LIBRARIES_DIR_HINT from configure_cmake.sh as primary hints
2222
# and then package config information after that.

doc/reference/builtin_stubs.txt

+4
Original file line numberDiff line numberDiff line change
@@ -1287,6 +1287,10 @@ HTTP/2 preface received instead of an HTTP/1 method
12871287

12881288
HTTP request method is not on allowed methods list or is on disallowed methods list.
12891289

1290+
119:288
1291+
1292+
HTTP reserved GZIP flags are set
1293+
12901294
121:1
12911295

12921296
Invalid flag set on HTTP/2 frame header

0 commit comments

Comments
 (0)