lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-01-04 08:15:21 -05:00
Code Issues Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
Darien Raymond
2017-04-23 19:16:56 +02:00
parent cea6e28634
commit 59a1e2d736
10 changed files with 104 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/dns/config.go
View File

@@ -6,9 +6,9 @@ import (
"v2ray.com/core/app/log"
)
func (v *Config) GetInternalHosts() map[string]net.IP {
func (c *Config) GetInternalHosts() map[string]net.IP {
hosts := make(map[string]net.IP)
for domain, ipOrDomain := range v.GetHosts() {
for domain, ipOrDomain := range c.GetHosts() {
address := ipOrDomain.AsAddress()
if address.Family().IsDomain() {
log.Trace(newError("ignoring domain address in static hosts: ", address.Domain()).AtWarning())

23
app/dns/server/server.go
View File

@@ -80,40 +80,39 @@ func (*CacheServer) Start() error {
func (*CacheServer) Close() {}
// Private: Visible for testing.
func (v *CacheServer) GetCached(domain string) []net.IP {
v.RLock()
defer v.RUnlock()
func (s *CacheServer) GetCached(domain string) []net.IP {
s.RLock()
defer s.RUnlock()
if record, found := v.records[domain]; found && record.A.Expire.After(time.Now()) {
if record, found := s.records[domain]; found && record.A.Expire.After(time.Now()) {
return record.A.IPs
}
return nil
}
func (v *CacheServer) Get(domain string) []net.IP {
if ip, found := v.hosts[domain]; found {
func (s *CacheServer) Get(domain string) []net.IP {
if ip, found := s.hosts[domain]; found {
return []net.IP{ip}
}
domain = dnsmsg.Fqdn(domain)
ips := v.GetCached(domain)
ips := s.GetCached(domain)
if ips != nil {
return ips
}
for _, server := range v.servers {
for _, server := range s.servers {
response := server.QueryA(domain)
select {
case a, open := <-response:
if !open || a == nil {
continue
}
v.Lock()
v.records[domain] = &DomainRecord{
s.Lock()
s.records[domain] = &DomainRecord{
A: a,
}
v.Unlock()
s.Unlock()
log.Trace(newError("returning ", len(a.IPs), " IPs for domain ", domain).AtDebug())
return a.IPs
case <-time.After(QueryTimeout):