refactor(plc4xanalyzer): moved override logic out of commands

apache · Nov 1, 2022 · 9de6d03 · 9de6d03
1 parent 00d418f
commit 9de6d03
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 18 deletions.
diff --git 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
@@ -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
@@ -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