lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-02-20 23:47:21 -05:00
Code Issues Releases Wiki Activity

fix dns query for CNAME

Browse Source
This commit is contained in:
Darien Raymond 2018-07-01 17:15:29 +02:00
parent 4368edf87c
commit 4c18b61e6c
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 44 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
app/dns/udpns.go
View File

@ -29,10 +29,16 @@ type IPRecord struct {
Expire time.Time Expire time.Time
} }
type pendingRequest struct {
domain string
expire time.Time
}
type ClassicNameServer struct { type ClassicNameServer struct {
sync.RWMutex sync.RWMutex
address net.Destination address net.Destination
ips map[string][]IPRecord ips map[string][]IPRecord
requests map[uint16]pendingRequest
pub *pubsub.Service pub *pubsub.Service
udpServer *udp.Dispatcher udpServer *udp.Dispatcher
cleanup *task.Periodic cleanup *task.Periodic
@ -44,6 +50,7 @@ func NewClassicNameServer(address net.Destination, dispatcher core.Dispatcher, c
s := &ClassicNameServer{ s := &ClassicNameServer{
address: address, address: address,
ips: make(map[string][]IPRecord), ips: make(map[string][]IPRecord),
requests: make(map[uint16]pendingRequest),
udpServer: udp.NewDispatcher(dispatcher), udpServer: udp.NewDispatcher(dispatcher),
clientIP: clientIP, clientIP: clientIP,
pub: pubsub.NewService(), pub: pubsub.NewService(),
@ -77,6 +84,16 @@ func (s *ClassicNameServer) Cleanup() error {
s.ips = make(map[string][]IPRecord) s.ips = make(map[string][]IPRecord)
} }
for id, req := range s.requests {
if req.expire.Before(now) {
delete(s.requests, id)
}
}
if len(s.requests) == 0 {
s.requests = make(map[uint16]pendingRequest)
}
s.Unlock() s.Unlock()
return nil return nil
} }
@ -91,16 +108,24 @@ func (s *ClassicNameServer) HandleResponse(payload *buf.Buffer) {
return return
} }
var domain string id := msg.Id
s.Lock()
req, f := s.requests[id]
if f {
delete(s.requests, id)
}
s.Unlock()
if !f {
return
}
domain := req.domain
ips := make([]IPRecord, 0, 16) ips := make([]IPRecord, 0, 16)
now := time.Now() now := time.Now()
for _, rr := range msg.Answer { for _, rr := range msg.Answer {
var ip net.IP var ip net.IP
name := rr.Header().Name
if len(name) > 0 {
domain = rr.Header().Name
}
ttl := rr.Header().Ttl ttl := rr.Header().Ttl
switch rr := rr.(type) { switch rr := rr.(type) {
case *dns.A: case *dns.A:
@ -164,7 +189,19 @@ func (s *ClassicNameServer) getMsgOptions() *dns.OPT {
o.Option = append(o.Option, e) o.Option = append(o.Option, e)
return o return o
}
func (s *ClassicNameServer) addPendingRequest(domain string) uint16 {
id := uint16(atomic.AddUint32(&s.reqID, 1))
s.Lock()
defer s.Unlock()
s.requests[id] = pendingRequest{
domain: domain,
expire: time.Now().Add(time.Second * 8),
}
return id
} }
func (s *ClassicNameServer) buildMsgs(domain string) []*dns.Msg { func (s *ClassicNameServer) buildMsgs(domain string) []*dns.Msg {
@ -186,7 +223,7 @@ func (s *ClassicNameServer) buildMsgs(domain string) []*dns.Msg {
{ {
msg := new(dns.Msg) msg := new(dns.Msg)
msg.Id = uint16(atomic.AddUint32(&s.reqID, 1)) msg.Id = s.addPendingRequest(domain)
msg.RecursionDesired = true msg.RecursionDesired = true
msg.Question = []dns.Question{qA} msg.Question = []dns.Question{qA}
if allowMulti { if allowMulti {
@ -200,7 +237,7 @@ func (s *ClassicNameServer) buildMsgs(domain string) []*dns.Msg {
if !allowMulti { if !allowMulti {
msg := new(dns.Msg) msg := new(dns.Msg)
msg.Id = uint16(atomic.AddUint32(&s.reqID, 1)) msg.Id = s.addPendingRequest(domain)
msg.RecursionDesired = true msg.RecursionDesired = true
msg.Question = []dns.Question{qAAAA} msg.Question = []dns.Question{qAAAA}
if opt := s.getMsgOptions(); opt != nil { if opt := s.getMsgOptions(); opt != nil {