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/396/20240415/v1 #10852

Merged
merged 7 commits into from Apr 16, 2024
Merged

next/396/20240415/v1 #10852

merged 7 commits into from Apr 16, 2024

Conversation

victorjulien
Copy link
Member

catenacyber and others added 7 commits April 14, 2024 21:34
@catenacyber
detect/analyzer: create tojson function for generic integers
49caf00 
As will be needed for tcp.mss
@catenacyber
detect/analyzer: add more details for tcp_mss
bd3bed6 
Issue: OISF#6355
@victorjulien
decode/ppp: support different header formats
68092ff 
Support compressed proto and optional HDLC header.

Bug: OISF#6942.
@victorjulien
decode/ppp: remove ppph check in favor of flag
6067955 
As we now support variable size headers, we can't use the old pointer.

Replace with a flag.
@victorjulien
decode/ppp: clean up ppph pointer use
7e3f071 
No users of the pointer anymore, so remove it.
@victorjulien
decode/ppp: add missing types definitions
516441b 
Recognize PPP_CCP, PPP_CBCP and PPP_COMP_DGRAM.

Does not implement decoders for these record types, so these
are logged as unsupported types. Was "wrong_type" before.
@jlucovsky @victorjulien
flow/inject: Select thread_id by flow flag
c305ed1 
Issue: 6957

Rather than selecting the thread_id index by packets traveling to the
server, use the flow flags. If the flow has been reversed, the second
slot is represents the thread id to be used.
@codecov Codecov
Copy link

codecov bot commented Apr 15, 2024

Codecov Report

Attention: Patch coverage is 83.59375% with 21 lines in your changes are missing coverage. Please review.

Project coverage is 82.88%. Comparing base (784ce30) to head (c305ed1).

Additional details and impacted files 
@@            Coverage Diff             @@
##           master   #10852      +/-   ##
==========================================
+ Coverage   82.83%   82.88%   +0.04%     
==========================================
  Files         913      914       +1     
  Lines      246847   246936      +89     
==========================================
+ Hits       204474   204671     +197     
+ Misses      42373    42265     -108
Flag Coverage Δ
fuzzcorpus 64.37% <46.87%> (+0.06%) ⬆️
suricata-verify 62.19% <51.56%> (+0.09%) ⬆️
unittests 62.31% <20.31%> (-0.02%) ⬇️

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

@suricata-qa
Copy link

WARNING:

field baseline test %
SURI_TLPR1_stats_chk
.decoder.event.ppp.wrong_type 2862 0 -
.decoder.event.ppp.unsup_proto 931 3772 405.16%

Pipeline 20078

@victorjulien
Copy link
Member Author

WARNING:
field baseline test %
SURI_TLPR1_stats_chk
.decoder.event.ppp.wrong_type 2862 0 -
.decoder.event.ppp.unsup_proto 931 3772 405.16%

Pipeline 20078

Expected, see #10844 (comment)

inashivb
inashivb approved these changes Apr 16, 2024
View reviewed changes
Copy link
Member

@inashivb inashivb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🚀

@victorjulien victorjulien merged commit c305ed1 into OISF:master Apr 16, 2024
47 checks passed
This was referenced Apr 16, 2024
Merged
Closed
Closed
@victorjulien victorjulien deleted the next/396/20240415/v1 branch April 16, 2024 05:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@inashivb inashivb inashivb approved these changes

@jasonish jasonish Awaiting requested review from jasonish jasonish is a code owner

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
5 participants
@victorjulien @suricata-qa @inashivb @catenacyber @jlucovsky