chore: optimize dhcpd and dns and more

This commit is contained in:
nadoo committed 2022-01-29 21:10:09 +08:00
1 parent 7e7c7553cc
commit f2eb638b91
9 files changed
+56 -54

No files matched your search

+6 -5
View File
@@ -138,11 +138,12 @@ func (c *Client) extractAnswer(resp *Message) ([]string, int) {
ttl := c.config.MinTTL
for _, answer := range resp.Answers {
if answer.TYPE == QTypeA || answer.TYPE == QTypeAAAA {
for _, h := range c.handlers {
h(resp.Question.QNAME, answer.IP)
}
if answer.IP != "" {
ips = append(ips, answer.IP)
if answer.IP.IsValid() {
ip := answer.IP.String()
for _, h := range c.handlers {
h(resp.Question.QNAME, ip)
}
ips = append(ips, ip)
}
if answer.TTL != 0 {
ttl = int(answer.TTL)
+4 -4
View File
@@ -6,7 +6,7 @@ import (
"errors"
"io"
"math/rand"
"net"
"net/netip"
"strings"
)
@@ -360,7 +360,7 @@ type RR struct {
RDLENGTH uint16
RDATA []byte
IP string
IP netip.Addr
}
// NewRR returns a new dns rr.
@@ -441,9 +441,9 @@ func (m *Message) UnmarshalRR(start int, rr *RR) (n int, err error) {
rr.RDATA = p[n+10 : n+10+int(rr.RDLENGTH)]
if rr.TYPE == QTypeA {
rr.IP = net.IP(rr.RDATA[:net.IPv4len]).String()
rr.IP = netip.AddrFrom4(*(*[4]byte)(rr.RDATA[:4]))
} else if rr.TYPE == QTypeAAAA {
rr.IP = net.IP(rr.RDATA[:net.IPv6len]).String()
rr.IP = netip.AddrFrom16(*(*[16]byte)(rr.RDATA[:16]))
}
n = n + 10 + int(rr.RDLENGTH)