filestore v2: print sid in json output (Optimization #2530) #3600
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
regit
suggested changes
Dec 30, 2018
| @@ -264,6 +264,7 @@ static int DetectFilestoreMatch (ThreadVars *t, DetectEngineThreadCtx *det_ctx, | |||
| * matches. */ | |||
| if (file != NULL) { | |||
| file_id = file->file_store_id; | |||
| file->sid = s->id; | |||
There was a problem hiding this comment.
What is happening if we have multiple signatures triggering the filestore ?
| @@ -149,6 +149,9 @@ json_t *JsonBuildFileInfoRecord(const Packet *p, const File *ff, | |||
| json_object_set_new(fjs, "filename", SCJsonString(s)); | |||
| if (s != NULL) | |||
| SCFree(s); | |||
|
|
|||
| json_object_set_new(fjs, "sid", json_integer(ff->sid)); | |||
There was a problem hiding this comment.
I don't like the idea of having a 0 here if the signature is not defined. It is better not to set the variable at all.
3 tasks
|
Thank you Eric for your feedback, I made a new pull request in #3608 |
3 tasks
3 tasks
victorjulien
added a commit
to victorjulien/suricata
that referenced
this pull request
Apr 28, 2020
Allow a max depth of 64. Bug: OISF#3600
victorjulien
added a commit
to victorjulien/suricata
that referenced
this pull request
Apr 28, 2020
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.
Make sure these boxes are signed before submitting your Pull Request -- thank you.
Link to redmine ticket:
https://redmine.openinfosecfoundation.org/issues/2530
Describe changes:
PRScript output (if applicable):