sources: allow interface definitions to be reordered - v3 #2063
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
For af-packet, pf-ring, netmap, and pcap use a generic lookup function to find the configuration node for an interface. The new lookup function does not depend on the ordering of the items inside the device configuration.
Merged
|
Merged, thanks Jason! |
| @@ -121,9 +121,9 @@ void *ParsePcapConfig(const char *iface) | |||
| return aconf; | |||
| } | |||
|
|
|||
| if_root = ConfNodeLookupKeyValue(pcap_node, "interface", iface); | |||
| if_root = ConfFindDeviceConfig(pcap_node, "iface"); | |||
There was a problem hiding this comment.
I don't think iface should be quoted here?
Merged
|
I fixed both issues in #2070 |
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.
Lets try this again.
Previous PR: #2062
Related ticket: https://redmine.openinfosecfoundation.org/issues/1487
For af-packet, pf-ring, netmap, and pcap use a generic
lookup function to find the configuration node for an
interface.
The new lookup function does not depend on the ordering
of the items inside the device configuration.
Prscript: