Next v2 #1279
Merged
Next v2 #1279
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Host unittests were not registered so they wouldn't run.
This way they can be used by the *Inline* functions as well.
Don't conclude a GAP is 'final' until the missing data is ack'd. Further, cleanup and unify more with the non-inline code.
This patches is fixing a issue in the OutputJSONBuffer function. It was writing to file the content of the buffer starting from the start to the final offset. But as the writing is done for each JSON string we are duplicating the previous events if we are reusing the same buffer. Duplication was for example triggered when we have multiple alerts attached to a packet. In the case of two alerts, the first one was logged twice more as the second one.
If we follow the description in the yaml file, we should disable parsing if 'detection-only' keyword is used.
This was referenced Dec 23, 2014
ndenev
pushed a commit
to ndenev/suricata
that referenced
this pull request
Feb 5, 2015
Print proper variable so we don't NULL-deref. Bug OISF#1279.
alessandro-guido
pushed a commit
to alessandro-guido/suricata
that referenced
this pull request
Feb 26, 2015
Print proper variable so we don't NULL-deref. Bug OISF#1279.
ken-tilera
pushed a commit
to ken-tilera/suricata
that referenced
this pull request
Feb 27, 2015
Print proper variable so we don't NULL-deref. Bug OISF#1279.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#1274, #1262, IPS fixes from #1278 (but not all of the PR)
Prscript: