You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by sr...@apache.org on 2022/11/01 12:39:59 UTC
[plc4x] branch develop updated: fix(plc4xanalyzer): protocol filter should not override global filter
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/develop by this push:
new f8b1de00e fix(plc4xanalyzer): protocol filter should not override global filter
f8b1de00e is described below
commit f8b1de00e44e99489d0e0c9215e5b490017259e4
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Tue Nov 1 13:39:51 2022 +0100
fix(plc4xanalyzer): protocol filter should not override global filter
---
.../tools/plc4xpcapanalyzer/internal/analyzer/analyzer.go | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/plc4go/tools/plc4xpcapanalyzer/internal/analyzer/analyzer.go b/plc4go/tools/plc4xpcapanalyzer/internal/analyzer/analyzer.go
index abc8f48b7..3c32661a6 100644
--- a/plc4go/tools/plc4xpcapanalyzer/internal/analyzer/analyzer.go
+++ b/plc4go/tools/plc4xpcapanalyzer/internal/analyzer/analyzer.go
@@ -52,6 +52,9 @@ func AnalyzeWithOutput(pcapFile, protocolType string, stdout, stderr io.Writer)
func AnalyzeWithOutputAndCallback(ctx context.Context, pcapFile, protocolType string, stdout, stderr io.Writer, messageCallback func(parsed spi.Message)) error {
var filterExpression = config.AnalyzeConfigInstance.Filter
+ if filterExpression != "" {
+ log.Info().Msgf("Using global filter %s", filterExpression)
+ }
var mapPackets = func(in chan gopacket.Packet, packetInformationCreator func(packet gopacket.Packet) common.PacketInformation) chan gopacket.Packet {
return in
}
@@ -63,10 +66,10 @@ func AnalyzeWithOutputAndCallback(ctx context.Context, pcapFile, protocolType st
var byteOutput = hex.Dump
switch protocolType {
case "bacnetip":
- if !config.BacnetConfigInstance.NoFilter {
- if config.BacnetConfigInstance.Filter == "" && config.BacnetConfigInstance.BacnetFilter != "" {
+ if !config.AnalyzeConfigInstance.NoFilter {
+ if config.AnalyzeConfigInstance.Filter == "" && config.BacnetConfigInstance.BacnetFilter != "" {
log.Debug().Str("filter", config.BacnetConfigInstance.Filter).Msg("Setting bacnet filter")
- config.BacnetConfigInstance.Filter = config.BacnetConfigInstance.BacnetFilter
+ filterExpression = config.BacnetConfigInstance.BacnetFilter
}
} else {
log.Info().Msg("All filtering disabled")
@@ -74,10 +77,10 @@ func AnalyzeWithOutputAndCallback(ctx context.Context, pcapFile, protocolType st
packageParse = bacnetanalyzer.PackageParse
serializePackage = bacnetanalyzer.SerializePackage
case "c-bus":
- if !config.CBusConfigInstance.NoFilter {
- if config.CBusConfigInstance.Filter == "" && config.CBusConfigInstance.CBusFilter != "" {
+ if !config.AnalyzeConfigInstance.NoFilter {
+ if config.AnalyzeConfigInstance.Filter == "" && config.CBusConfigInstance.CBusFilter != "" {
log.Debug().Str("filter", config.CBusConfigInstance.Filter).Msg("Setting cbus filter")
- config.CBusConfigInstance.Filter = config.CBusConfigInstance.CBusFilter
+ filterExpression = config.CBusConfigInstance.CBusFilter
}
} else {
log.Info().Msg("All filtering disabled")