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.

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

Next/20210312/v3 #5977

Merged
merged 7 commits into from Mar 12, 2021
Merged

Next/20210312/v3 #5977

merged 7 commits into from Mar 12, 2021

Conversation

victorjulien
Copy link
Member

#5976 #5973 #5972 #5969

suricata-verify-pr: 472

victorjulien and others added 7 commits March 11, 2021 12:46
Per flow IP-only flags are checked and set by IP-only engine, so
no need to set/check them per alert.
Use a simpler reject check and move logic into util func.
When adding the alert to a drop record make sure the add the highest
priority.

It would until now add all drops from high to low prio, effectively
overwriting the record each time.

Ticket OISF#4397
If suricata-update is not available on "make install-full", don't
exit 1, instead give the reason why its not installed, but still
succeed the install.
@victorjulien victorjulien requested review from jasonish and a team as code owners March 12, 2021 15:35
@codecov
Copy link

codecov bot commented Mar 12, 2021

Codecov Report

Merging #5977 (cb150e9) into master (55a0e29) will decrease coverage by 0.01%.
The diff coverage is 72.72%.

@@            Coverage Diff             @@
##           master    #5977      +/-   ##
==========================================
- Coverage   76.79%   76.77%   -0.02%     
==========================================
  Files         612      612              
  Lines      188368   188363       -5     
==========================================
- Hits       144656   144624      -32     
- Misses      43712    43739      +27     
Flag Coverage Δ
fuzzcorpus 52.72% <0.00%> (+0.04%) ⬆️
suricata-verify 50.03% <72.72%> (-0.06%) ⬇️
unittests 63.01% <63.63%> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

@victorjulien victorjulien merged commit cb150e9 into OISF:master Mar 12, 2021
@victorjulien victorjulien deleted the next/20210312/v3 branch June 18, 2021 08:44
catenacyber added a commit to catenacyber/suricata that referenced this pull request May 25, 2023
catenacyber added a commit to catenacyber/suricata that referenced this pull request Jun 5, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
3 participants