Bug #904: store tx_id with alerts, update XFF -- v1.1 #577
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
When generating an alert and storing it in the packet, store the tx_id as well. This way the output modules can log the tx_id and access the proper tx for logging. Issue #904.
Use the tx id stored for each alert to find the correct XFF address to add to the extra-data field. In overwrite mode we still only grab the first available XFF addr, as this address is set in the header preceeding the individual alerts. Issue #904.
|
I've merged this after rebasing against master. |
|
Hopefully I will start testing this with live traffic mid next week, as we're currently making some deep changes on our network infrastructure :) |
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.
Store TX id in the packet, so easy access to it by output modules. Update alert-debuglog to output this info.
Update the XFF output in unified2 to try to use this tx_id for retrieving the XFF ip.
Bug: https://redmine.openinfosecfoundation.org/issues/904
prscript: https://buildbot.suricata-ids.org/builders/inliniac/builds/19
Replaces #555.
Changes: