From 5474ee9c619492fedb02a2c1966e4d0f11b4faea Mon Sep 17 00:00:00 2001
From: MDK <nobody@mail.mdk>
Date: Fri, 4 Aug 2023 17:23:12 +0800
Subject: [PATCH] log feature added

---
 1          |  4 ++++
 echodns.go |  7 +++++--
 go.mod     |  7 ++++++-
 go.sum     | 12 ++++++++++++
 4 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 1

diff --git a/1 b/1
new file mode 100644
index 0000000..a4065eb
--- /dev/null
+++ b/1
@@ -0,0 +1,4 @@
+echodns.go:12:2: no required module provides package github.com/rs/zerolog; to add it:
+	go get github.com/rs/zerolog
+echodns.go:13:2: no required module provides package github.com/rs/zerolog/log; to add it:
+	go get github.com/rs/zerolog/log
diff --git a/echodns.go b/echodns.go
index 237fde5..5517171 100644
--- a/echodns.go
+++ b/echodns.go
@@ -2,7 +2,6 @@ package main
 
 import (
 	"fmt"
-	"log"
 	"math/rand"
 	"net"
 	"strconv"
@@ -10,6 +9,8 @@ import (
 	"time"
 
 	"github.com/miekg/dns"
+	"github.com/rs/zerolog"
+	"github.com/rs/zerolog/log"
 )
 
 func strategyMaker(name string, qtype uint16) uint16 {
@@ -63,7 +64,8 @@ func handleReflect(w dns.ResponseWriter, r *dns.Msg) {
 	id = m.MsgHdr.Id
 	name = m.Question[0].Name
 	qtype = m.Question[0].Qtype
-	log.Printf("%v|%v|%v|%v|%v", ip, port, id, name, qtype)
+	log.Log().Str("sip", ip.String()).Int64("port", int64(port)).Int64("id", int64(id)).Str("name", name).Int64("qtype", int64(qtype)).Msg("")
+	//log.Printf("%v|%v|%v|%v|%v", ip, port, id, name, qtype)
 	//fmt.Println(ip)
 	//fmt.Println(name)
 	//fmt.Println(qtype)
@@ -116,6 +118,7 @@ func handleReflect(w dns.ResponseWriter, r *dns.Msg) {
 }
 
 func main() {
+	zerolog.TimeFieldFormat = zerolog.TimeFormatUnix
 	dns.HandleFunc("echodns.xyz.", handleReflect)
 	server := &dns.Server{Addr: ":53", Net: "udp"}
 	if err := server.ListenAndServe(); err != nil {
diff --git a/go.mod b/go.mod
index 5db246c..3ebf23f 100644
--- a/go.mod
+++ b/go.mod
@@ -2,9 +2,14 @@ module echodns
 
 go 1.20
 
-require github.com/miekg/dns v1.1.55
+require (
+	github.com/miekg/dns v1.1.55
+	github.com/rs/zerolog v1.30.0
+)
 
 require (
+	github.com/mattn/go-colorable v0.1.12 // indirect
+	github.com/mattn/go-isatty v0.0.14 // indirect
 	golang.org/x/mod v0.7.0 // indirect
 	golang.org/x/net v0.2.0 // indirect
 	golang.org/x/sys v0.2.0 // indirect
diff --git a/go.sum b/go.sum
index d25513d..75dcc35 100644
--- a/go.sum
+++ b/go.sum
@@ -1,10 +1,22 @@
+github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
+github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
+github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
+github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
+github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
+github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/miekg/dns v1.1.55 h1:GoQ4hpsj0nFLYe+bWiCToyrBEJXkQfOOIvFGFy0lEgo=
 github.com/miekg/dns v1.1.55/go.mod h1:uInx36IzPl7FYnDcMeVWxj9byh7DutNykX4G9Sj60FY=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
+github.com/rs/zerolog v1.30.0 h1:SymVODrcRsaRaSInD9yQtKbtWqwsfoPcRff/oRXLj4c=
+github.com/rs/zerolog v1.30.0/go.mod h1:/tk+P47gFdPXq4QYjvCmT5/Gsug2nagsFWBWhAiSi1w=
 golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA=
 golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.2.0 h1:sZfSu1wtKLGlWI4ZZayP0ck9Y73K1ynO6gqzTdBVdPU=
 golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
 golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
 golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/tools v0.3.0 h1:SrNbZl6ECOS1qFzgTdQfWXZM9XBkiA6tkFrH9YSTPHM=