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:02:35 UTC
[plc4x] 02/02: refactor(plc4xanalyzer): moved override logic out of commands
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
commit 9de6d0365f3cd6abb21486d1951bf358a2e7d45e
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Tue Nov 1 12:58:51 2022 +0100
refactor(plc4xanalyzer): moved override logic out of commands
---
plc4go/tools/plc4xpcapanalyzer/cmd/bacnet.go | 9 ---------
plc4go/tools/plc4xpcapanalyzer/cmd/cbus.go | 9 ---------
.../plc4xpcapanalyzer/internal/analyzer/analyzer.go | 16 ++++++++++++++++
3 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/plc4go/tools/plc4xpcapanalyzer/cmd/bacnet.go b/plc4go/tools/plc4xpcapanalyzer/cmd/bacnet.go
index 143051fc5..b268414e1 100644
--- a/plc4go/tools/plc4xpcapanalyzer/cmd/bacnet.go
+++ b/plc4go/tools/plc4xpcapanalyzer/cmd/bacnet.go
@@ -23,7 +23,6 @@ import (
"github.com/apache/plc4x/plc4go/tools/plc4xpcapanalyzer/config"
"github.com/apache/plc4x/plc4go/tools/plc4xpcapanalyzer/internal/analyzer"
"github.com/pkg/errors"
- "github.com/rs/zerolog/log"
"os"
"github.com/spf13/cobra"
@@ -48,14 +47,6 @@ TODO: document me
},
Run: func(cmd *cobra.Command, args []string) {
pcapFile := args[0]
- if !config.BacnetConfigInstance.NoFilter {
- if config.BacnetConfigInstance.Filter == "" && config.BacnetConfigInstance.BacnetFilter != "" {
- log.Debug().Str("filter", config.BacnetConfigInstance.Filter).Msg("Setting bacnet filter")
- config.BacnetConfigInstance.Filter = config.BacnetConfigInstance.BacnetFilter
- }
- } else {
- log.Info().Msg("All filtering disabled")
- }
if err := analyzer.Analyze(pcapFile, "bacnet"); err != nil {
panic(err)
}
diff --git a/plc4go/tools/plc4xpcapanalyzer/cmd/cbus.go b/plc4go/tools/plc4xpcapanalyzer/cmd/cbus.go
index 0b997047c..5c76e9844 100644
--- a/plc4go/tools/plc4xpcapanalyzer/cmd/cbus.go
+++ b/plc4go/tools/plc4xpcapanalyzer/cmd/cbus.go
@@ -23,7 +23,6 @@ import (
"github.com/apache/plc4x/plc4go/tools/plc4xpcapanalyzer/config"
"github.com/apache/plc4x/plc4go/tools/plc4xpcapanalyzer/internal/analyzer"
"github.com/pkg/errors"
- "github.com/rs/zerolog/log"
"os"
"github.com/spf13/cobra"
@@ -48,14 +47,6 @@ TODO: document me
},
Run: func(cmd *cobra.Command, args []string) {
pcapFile := args[0]
- if !config.CBusConfigInstance.NoFilter {
- if config.CBusConfigInstance.Filter == "" && config.CBusConfigInstance.CBusFilter != "" {
- log.Debug().Str("filter", config.CBusConfigInstance.Filter).Msg("Setting cbus filter")
- config.CBusConfigInstance.Filter = config.CBusConfigInstance.CBusFilter
- }
- } else {
- log.Info().Msg("All filtering disabled")
- }
if err := analyzer.Analyze(pcapFile, "c-bus"); err != nil {
panic(err)
}
diff --git a/plc4go/tools/plc4xpcapanalyzer/internal/analyzer/analyzer.go b/plc4go/tools/plc4xpcapanalyzer/internal/analyzer/analyzer.go
index da7e3552a..abc8f48b7 100644
--- a/plc4go/tools/plc4xpcapanalyzer/internal/analyzer/analyzer.go
+++ b/plc4go/tools/plc4xpcapanalyzer/internal/analyzer/analyzer.go
@@ -63,9 +63,25 @@ 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 != "" {
+ log.Debug().Str("filter", config.BacnetConfigInstance.Filter).Msg("Setting bacnet filter")
+ config.BacnetConfigInstance.Filter = config.BacnetConfigInstance.BacnetFilter
+ }
+ } else {
+ log.Info().Msg("All filtering disabled")
+ }
packageParse = bacnetanalyzer.PackageParse
serializePackage = bacnetanalyzer.SerializePackage
case "c-bus":
+ if !config.CBusConfigInstance.NoFilter {
+ if config.CBusConfigInstance.Filter == "" && config.CBusConfigInstance.CBusFilter != "" {
+ log.Debug().Str("filter", config.CBusConfigInstance.Filter).Msg("Setting cbus filter")
+ config.CBusConfigInstance.Filter = config.CBusConfigInstance.CBusFilter
+ }
+ } else {
+ log.Info().Msg("All filtering disabled")
+ }
analyzer := cbusanalyzer.Analyzer{Client: net.ParseIP(config.AnalyzeConfigInstance.Client)}
analyzer.Init()
packageParse = analyzer.PackageParse