github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

check domain name

pull/1546/head
Darien Raymond 2019-02-06 21:02:03 +01:00
parent fae47083c2
commit 2aa0c08709
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/dns/server.go
View File

@ -196,6 +196,14 @@ func toNetIP(ips []net.Address) []net.IP {
} }
func (s *Server) lookupIPInternal(domain string, option IPOption) ([]net.IP, error) { func (s *Server) lookupIPInternal(domain string, option IPOption) ([]net.IP, error) {
if len(domain) == 0 {
return nil, newError("empty domain name")
}
if domain[len(domain)-1] == '.' {
domain = domain[:len(domain)-1]
}
ips := s.lookupStatic(domain, option, 0) ips := s.lookupStatic(domain, option, 0)
if ips != nil && ips[0].Family().IsIP() { if ips != nil && ips[0].Family().IsIP() {
return toNetIP(ips), nil return toNetIP(ips), nil

6
proxy/dns/dns.go
View File

@ -216,18 +216,18 @@ func (h *Handler) handleIPQuery(id uint16, qType dnsmessage.Type, domain string,
RCode: dnsmessage.RCodeSuccess, RCode: dnsmessage.RCodeSuccess,
Response: true, Response: true,
}) })
builder.StartAnswers() common.Must(builder.StartAnswers())
rHeader := dnsmessage.ResourceHeader{Name: dnsmessage.MustNewName(domain), Class: dnsmessage.ClassINET, TTL: 600} rHeader := dnsmessage.ResourceHeader{Name: dnsmessage.MustNewName(domain), Class: dnsmessage.ClassINET, TTL: 600}
for _, ip := range ips { for _, ip := range ips {
if len(ip) == net.IPv4len { if len(ip) == net.IPv4len {
var r dnsmessage.AResource var r dnsmessage.AResource
copy(r.A[:], ip) copy(r.A[:], ip)
builder.AResource(rHeader, r) common.Must(builder.AResource(rHeader, r))
} else { } else {
var r dnsmessage.AAAAResource var r dnsmessage.AAAAResource
copy(r.AAAA[:], ip) copy(r.AAAA[:], ip)
builder.AAAAResource(rHeader, r) common.Must(builder.AAAAResource(rHeader, r))
} }
} }
msgBytes, err := builder.Finish() msgBytes, err := builder.Finish()