Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Next/60x/20230412/v4 #8721

Merged
merged 7 commits into from Apr 13, 2023
Merged

Next/60x/20230412/v4 #8721

merged 7 commits into from Apr 13, 2023

Conversation

victorjulien
Copy link
Member

#8720 with minor cleanup.

victorjulien and others added 7 commits April 13, 2023 07:34
@victorjulien
flow/worker: refresh detect thread during housekeeping
6658300 
During housekeeping multiple flows are processed. If a rule reload happens
at that time, we need to use the new detect thread as soon as possible.

Bug: OISF#5969.
(cherry picked from commit 5e4cf18)
@victorjulien
detect: only breakloop threads that are lagging
6d8b50b 
Sleep after all threads have been checked.

Bug: OISF#5969.
(cherry picked from commit 8a968fa)
@victorjulien
pcap: improve pcap_breakloop support
80abc31 
When pcap_breakloop has been issued on a handle, the current pcap_dispatch
call may return -2 (PCAP_ERROR_BREAK), but it can also return the number
of processed packets if lower than the desired number. So add this condition
as a check.

(cherry picked from commit 9fe08f2)
(cherry picked from commit 2ddd264)
@inashivb @victorjulien
smtp: move constant declaration to header
707dc70 
(cherry picked from commit c0bff5f)
@inashivb @victorjulien
util/mime: allow delim len 0 when line limit is hit
564c779 
(cherry picked from commit fd4e0fb)
@inashivb @victorjulien
smtp: reset current line len at start
08fd667
@inashivb @victorjulien
smtp: enforce line limit even when LF is found
92d7234 
Before:
If LF character was found, so far, we won't enforce the line limit on
the line. We only enforced limits in case of LF character missing in a
long line.

After this patch:
Line limit is enforced on the line if it is bigger than 4096 Bytes
irrespective of whether LF was found or not.

Redmine Bug: 5819

(cherry picked from commit 5f52b19)
@victorjulien victorjulien requested a review from a team as a code owner April 13, 2023 08:25
@victorjulien victorjulien mentioned this pull request Apr 13, 2023
Closed
@suricata-qa
Copy link

Information:

field baseline test %
TREX_GENERIC_stats_chk
.capture.kernel_drops 0 77443 0.01

Pipeline 13148

@victorjulien victorjulien merged commit 92d7234 into OISF:master-6.0.x Apr 13, 2023
22 checks passed
@victorjulien victorjulien mentioned this pull request Apr 13, 2023
Closed
@victorjulien victorjulien deleted the next/60x/20230412/v4 branch April 17, 2023 07:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Milestone
No milestone
3 participants
@victorjulien @suricata-qa @inashivb