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

filestore v2: print sid in json output (Optimization #2530) v7 #3657

Closed
wants to merge 1 commit into from
Closed

filestore v2: print sid in json output (Optimization #2530) v7 #3657

wants to merge 1 commit into from

Conversation

magenbluten
Copy link
Contributor

@magenbluten magenbluten commented Feb 15, 2019

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:

  • print SID(s) of a triggering rule in json fileinfo file if there are any
  • fixup for #3656

PRScript output (if applicable):

@magenbluten magenbluten requested a review from a team as a code owner February 15, 2019 13:33
@magenbluten magenbluten changed the title filestore v2: print sid in json output filestore v2: print sid in json output v7 Feb 15, 2019
@magenbluten magenbluten changed the title filestore v2: print sid in json output v7 filestore v2: print sid in json output (Optimization #2530) v7 Feb 15, 2019
@@ -149,6 +149,18 @@ json_t *JsonBuildFileInfoRecord(const Packet *p, const File *ff,
json_object_set_new(fjs, "filename", SCJsonString(s));
if (s != NULL)
SCFree(s);

json_t *sig_ids = json_array();
if (unlikely(fjs == NULL)) {
Copy link
Member

Choose a reason for hiding this comment

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

this should check sig_ids I think. I'll fix it up

@victorjulien victorjulien mentioned this pull request Feb 18, 2019
@victorjulien
Copy link
Member

Merged in #3673 with the fix I mentioned above, thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
2 participants