lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-12-22 01:57:12 -05:00
Code Issues Releases Wiki Activity

refactor UDPNameServer clean up task

Browse Source
This commit is contained in:
Darien Raymond 2018-02-22 17:29:21 +01:00
parent df34931ab3
commit 0a3b3d0b6d
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
app/dns/nameserver.go
View File

@ -10,14 +10,10 @@ import (
"v2ray.com/core/common/buf"
"v2ray.com/core/common/dice"
"v2ray.com/core/common/net"
"v2ray.com/core/common/signal"
"v2ray.com/core/transport/internet/udp"
)
const (
CleanupInterval = time.Second * 120
CleanupThreshold = 512
)
var (
multiQuestionDNS = map[net.Address]bool{
net.IPAddress([]byte{8, 8, 8, 8}): true,
@ -42,10 +38,10 @@ type PendingRequest struct {
type UDPNameServer struct {
sync.Mutex
address net.Destination
requests map[uint16]*PendingRequest
udpServer *udp.Dispatcher
nextCleanup time.Time
address net.Destination
requests map[uint16]*PendingRequest
udpServer *udp.Dispatcher
cleanup *signal.PeriodicTask
}
func NewUDPNameServer(address net.Destination, dispatcher core.Dispatcher) *UDPNameServer {
@ -54,36 +50,35 @@ func NewUDPNameServer(address net.Destination, dispatcher core.Dispatcher) *UDPN
requests: make(map[uint16]*PendingRequest),
udpServer: udp.NewDispatcher(dispatcher),
}
s.cleanup = &signal.PeriodicTask{
Interval: time.Minute,
Execute: s.Cleanup,
}
s.cleanup.Start()
return s
}
func (s *UDPNameServer) Cleanup() {
expiredRequests := make([]uint16, 0, 16)
func (s *UDPNameServer) Cleanup() error {
now := time.Now()
s.Lock()
for id, r := range s.requests {
if r.expire.Before(now) {
expiredRequests = append(expiredRequests, id)
close(r.response)
delete(s.requests, id)
}
}
for _, id := range expiredRequests {
delete(s.requests, id)
}
s.Unlock()
return nil
}
func (s *UDPNameServer) AssignUnusedID(response chan<- *ARecord) uint16 {
var id uint16
s.Lock()
if len(s.requests) > CleanupThreshold && s.nextCleanup.Before(time.Now()) {
s.nextCleanup = time.Now().Add(CleanupInterval)
go s.Cleanup()
}
for {
id = dice.RollUint16()
if _, found := s.requests[id]; found {
time.Sleep(time.Millisecond * 500)
continue
}
newError("add pending request id ", id).AtDebug().WriteToLog()