minor refacto

dmachard · May 7, 2024 · dd11478 · dd11478
1 parent 95b7e59
commit dd11478
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/collectors/dnstap_relay_test.go b/collectors/dnstap_relay_test.go
@@ -6,6 +6,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/dmachard/go-dnscollector/dnsutils"
 	"github.com/dmachard/go-dnscollector/netutils"
 	"github.com/dmachard/go-dnscollector/pkgconfig"
 	"github.com/dmachard/go-dnscollector/pkgutils"
@@ -75,7 +76,7 @@ func Test_DnstapRelay(t *testing.T) {
 				frame := &framestream.Frame{}
 
 				// get fake dns question
-				dnsquery, err := processors.GetFakeDNS()
+				dnsquery, err := dnsutils.GetFakeDNS()
 				if err != nil {
 					t.Fatalf("dns question pack error")
 				}

diff --git a/collectors/dnstap_test.go b/collectors/dnstap_test.go
@@ -8,6 +8,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/dmachard/go-dnscollector/dnsutils"
 	"github.com/dmachard/go-dnscollector/netutils"
 	"github.com/dmachard/go-dnscollector/pkgconfig"
 	"github.com/dmachard/go-dnscollector/pkgutils"
@@ -96,7 +97,7 @@ func Test_DnstapCollector(t *testing.T) {
 				subFrame := &framestream.Frame{}
 
 				// get fake dns question
-				dnsquery, err := processors.GetFakeDNS()
+				dnsquery, err := dnsutils.GetFakeDNS()
 				if err != nil {
 					t.Fatalf("dns question pack error")
 				}

diff --git a/dnsutils/message.go b/dnsutils/message.go
@@ -40,6 +40,12 @@ var (
 	ATagsDirectives           = regexp.MustCompile(`^atags*`)
 )
 
+func GetFakeDNS() ([]byte, error) {
+	dnsmsg := new(dns.Msg)
+	dnsmsg.SetQuestion("dns.collector.", dns.TypeA)
+	return dnsmsg.Pack()
+}
+
 func GetIPPort(dm *DNSMessage) (string, int, string, int) {
 	srcIP, srcPort := "0.0.0.0", 53
 	dstIP, dstPort := "0.0.0.0", 53

diff --git a/processors/dns.go b/processors/dns.go
@@ -9,15 +9,8 @@ import (
 	"github.com/dmachard/go-dnscollector/pkgutils"
 	"github.com/dmachard/go-dnscollector/transformers"
 	"github.com/dmachard/go-logger"
-	"github.com/miekg/dns"
 )
 
-func GetFakeDNS() ([]byte, error) {
-	dnsmsg := new(dns.Msg)
-	dnsmsg.SetQuestion("dns.collector.", dns.TypeA)
-	return dnsmsg.Pack()
-}
-
 type DNSProcessor struct {
 	doneRun, stopRun         chan bool
 	doneMonitor, stopMonitor chan bool