Fix the custom BPF filter option #2671
Merged
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
Set the `sniffer.filter` before `setFromConfig` is called. Changed the factory prototype so it doesn't pass around `filter` and instead just done it directly via Init. Fixes elastic#2660.
c243f8d to
093f159
Compare
urso
reviewed
Oct 4, 2016
| @@ -198,19 +198,19 @@ func (pb *Packetbeat) setupSniffer() error { | |||
| } | |||
|
|
|||
| pb.Sniff = &sniffer.SnifferSetup{} | |||
| return pb.Sniff.Init(false, pb.makeWorkerFactory(filter), &config.Interfaces) | |||
| return pb.Sniff.Init(false, filter, pb.makeWorkerFactory(), &config.Interfaces) | |||
There was a problem hiding this comment.
no need to have makeWorkerFactory. consider changing to:
return pb.Sniff.Init(false, filter, pb.createWorker, &config.Interfaces)
...
func (pb *Packetbeat) createWorker(dl layers.LinkType) (sniffer.Worker, error) {
}
tsg
added a commit
to tsg/beats
that referenced
this pull request
Oct 4, 2016
* Fix the custom BPF filter option Set the `sniffer.filter` before `setFromConfig` is called. Changed the factory prototype so it doesn't pass around `filter` and instead just done it directly via Init. Fixes elastic#2660. * Simplified code by removing the factory maker
monicasarbu
pushed a commit
that referenced
this pull request
Oct 4, 2016
* Fix the custom BPF filter option Set the `sniffer.filter` before `setFromConfig` is called. Changed the factory prototype so it doesn't pass around `filter` and instead just done it directly via Init. Fixes #2660. * Simplified code by removing the factory maker
leweafan
pushed a commit
to leweafan/beats
that referenced
this pull request
Apr 28, 2023
* Fix the custom BPF filter option Set the `sniffer.filter` before `setFromConfig` is called. Changed the factory prototype so it doesn't pass around `filter` and instead just done it directly via Init. Fixes elastic#2660. * Simplified code by removing the factory maker
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.
Set the
sniffer.filterbeforesetFromConfigis called. Changed thefactory prototype so it doesn't pass around
filterand instead justdone it directly via Init.
Fixes #2660.