Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
hktalent committed Apr 22, 2022
1 parent f9c6d4c commit b62ef22
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 17 deletions.
12 changes: 12 additions & 0 deletions Makefile.cross-compiles
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,15 @@ app:
)
@mv ./release/DNS_Server_windows_386 ./release/DNS_Server_windows_386.exe
@mv ./release/DNS_Server_windows_amd64 ./release/DNS_Server_windows_amd64.exe

linux:
@$(os-archs=linux:amd64;\
echo os-archs;\
foreach n, $(os-archs),\
os=$(shell echo "$(n)" | cut -d : -f 1);\
arch=$(shell echo "$(n)" | cut -d : -f 2);\
gomips=$(shell echo "$(n)" | cut -d : -f 3);\
target_suffix=$${os}_$${arch};\
env CGO_ENABLED=0 GOOS=$${os} GOARCH=$${arch} GOMIPS=$${gomips} go build -trimpath -ldflags "$(LDFLAGS)" -o ./release/DNS_Server_$${target_suffix} .;\
echo "Build $${os}-$${arch} done";\
)
28 changes: 11 additions & 17 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func testIs(s1 string) bool {

// 解决相同多次请求的问题
func sendReq(addressOfRequester net.Addr, domain1 string) {
// 处理过就直接返回,减少ES服务器交互
// 处理过就直接返回,减少 Elasticsearch 服务器交互
cv, err := cache.Get(domain1)
if nil != err && "" != string(cv) {
cache.Put(domain1, []byte(addressOfRequester.String()))
Expand Down Expand Up @@ -84,30 +84,23 @@ func sendReq(addressOfRequester net.Addr, domain1 string) {
}

func otherDns(s string) string {
cv, err := cache.Get(s)
if nil != err && "" != string(cv) {
return string(cv)
}

resolver := dns_resolver.New([]string{"8.8.8.8", "8.8.4.4"})
resolver.RetryTimes = 5

// c := dns.Client{}
// m := dns.Msg{}
// m.SetQuestion(s, dns.TypeA)
// r, _, err := c.Exchange(&m, "8.8.8.8:53")

ip, err := resolver.LookupHost(s[0 : strings.Count(s, "")-2])
if err != nil {
logrus.Error(err)

}
// szIp1 := ip
// logrus.Info(r)
// if len(r.Answer) > 0 {
// for _, ans := range r.Answer {
// Arecord := ans.(*dns.A)
// szIp1 = fmt.Sprintf(`%s`, Arecord.A)
// // logrus.Info(Arecord.A, szIp1)
// }
// }
// // logrus.Info(t)
if 0 < len(ip) {
return fmt.Sprintf(`%s`, ip[0])
s1 := fmt.Sprintf(`%s`, ip[0])
cache.Put(s, []byte(s1))
return s1
} else {
return ""
}
Expand All @@ -127,6 +120,7 @@ func parseQuery(m *dns.Msg, addressOfRequester net.Addr) {
fmt.Println(q.Name)
value1, ok := dnsKm.Load(strings.ToLower(q.Name))
if !ok {
fmt.Println(q.Name, "dnsKm.Load=", value1)
continue
}
value := value1.(string)
Expand Down

0 comments on commit b62ef22

Please sign in to comment.