suricata icon indicating copy to clipboard operation
suricata copied to clipboard

Output notx 6846 backport7 v2

Open catenacyber opened this issue 1 month ago • 2 comments

Link to redmine ticket: https://redmine.openinfosecfoundation.org/issues/6848 https://redmine.openinfosecfoundation.org/issues/6975

Describe changes:

  • Backport of https://github.com/OISF/suricata/pull/10876 +
  • Backport of follow-up https://github.com/OISF/suricata/pull/10891 (clean cherry-pick) +
  • Backport of another follow-up https://github.com/OISF/suricata/pull/11064 but only its first commit (clean cherry-pick)

No backport of https://github.com/OISF/suricata/pull/11064 other commits as they bring in features (specifying transaction ids for frames), instead of fixing the bug that we were logging tx id 0 when irrelevant

First Commit 910f6af54fa37cde1790bbff46162b7dee864bb6 needed a small conflict fix in detect-engine-alert.c AlertQueueSortHelper, because of style

if (a) 
    return x;
else
    return y;

was turned into

if (a) 
    return x;
return y;

https://github.com/OISF/suricata/pull/10889 new version with later commits

catenacyber avatar May 15 '24 14:05 catenacyber