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/20200711/v4 #5169

Merged
merged 54 commits into from
Jul 11, 2020
Merged

Next/20200711/v4 #5169

merged 54 commits into from
Jul 11, 2020

Conversation

victorjulien
Copy link
Member

#5167
#5166 with minor fixup (removing an assert)
#5153
#5152

PRScript output (if applicable):
Passed

suricata-verify-pr: 271
#suricata-verify-repo:
#suricata-verify-branch:
#suricata-update-pr:
#suricata-update-repo:
#suricata-update-branch:
#libhtp-pr:
#libhtp-repo:
#libhtp-branch:

jlucovsky and others added 30 commits July 11, 2020 08:36
Replaces all patterns of SCLogError() followed by exit() with
FatalError(). Cocci script to do this:

@@
constant C;
constant char[] msg;
@@

- SCLogError(C,
+ FatalError(SC_ERR_FATAL,
  msg);
- exit(EXIT_FAILURE);

Closes redmine ticket 3188.
Some changes were made to the generated files instead of the
generator script. Update the script to generate what is
in the current state of the in-tree generated files.
First step of converting DNP3 to JsonBuilder by first converting
the non-generated code.
New methods for setting and appending float values.
Migration from Jansson to JsonBuilder.
This way the AppLayerTxData is set up from the start. Any type of
processing (logging, detection) will lead to setting up the user
data later on anyway.

Remove other places where it was added.
AppLayerTxData is a structure each tx should include that will contain
the common fields the engine needs for tracking logging, detection and
possibly other things.

AppLayerTxConfig will be used by the detection engine to configure
the transaction.
Optional callback a parser can register for applying configuration
to the 'transaction'. Most parsers have a bidirectional tx. For those
parsers that have different types of transaction handling, this new
callback can be used to properly apply the config.
@victorjulien victorjulien requested review from jasonish, norg and a team as code owners July 11, 2020 14:00
@victorjulien victorjulien merged commit 9d9a901 into OISF:master Jul 11, 2020
@victorjulien victorjulien deleted the next/20200711/v4 branch July 17, 2020 04:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

4 participants