a
/
badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rename functions and container

This commit is contained in:
Simon Zolin 2019-05-13 14:47:55 +03:00
parent 24ae61de3e
commit b3461d37ca
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dnsfilter/dnsfilter.go
View File

@ -157,7 +157,7 @@ const (
// these variables need to survive coredns reload // these variables need to survive coredns reload
var ( var (
stats Stats stats Stats
securityCache gcache.Cache // "host" -> "IP" cache for safebrowsing and parental control servers dialCache gcache.Cache // "host" -> "IP" cache for safebrowsing and parental control servers
safebrowsingCache gcache.Cache safebrowsingCache gcache.Cache
parentalCache gcache.Cache parentalCache gcache.Cache
safeSearchCache gcache.Cache safeSearchCache gcache.Cache
@ -974,14 +974,14 @@ func (d *Dnsfilter) matchHost(host string) (Result, error) {
// //
// Return TRUE if this host's IP should be cached // Return TRUE if this host's IP should be cached
func (d *Dnsfilter) shouldCache(host string) bool { func (d *Dnsfilter) shouldBeInDialCache(host string) bool {
return host == d.safeBrowsingServer || return host == d.safeBrowsingServer ||
host == d.parentalServer host == d.parentalServer
} }
// Search for an IP address by host name // Search for an IP address by host name
func searchInCache(host string) string { func searchInDialCache(host string) string {
rawValue, err := securityCache.Get(host) rawValue, err := dialCache.Get(host)
if err != nil { if err != nil {
return "" return ""
} }
@ -992,8 +992,8 @@ func searchInCache(host string) string {
} }
// Add "hostname" -> "IP address" entry to cache // Add "hostname" -> "IP address" entry to cache
func addToCache(host, ip string) { func addToDialCache(host, ip string) {
securityCache.Set(host, ip) dialCache.Set(host, ip)
log.Debug("Added to cache: %s -> %s", host, ip) log.Debug("Added to cache: %s -> %s", host, ip)
} }
@ -1018,9 +1018,9 @@ func (d *Dnsfilter) createCustomDialContext(resolverAddr string) dialFunctionTyp
return con, err return con, err
} }
cache := d.shouldCache(host) cache := d.shouldBeInDialCache(host)
if cache { if cache {
ip := searchInCache(host) ip := searchInDialCache(host)
if len(ip) != 0 { if len(ip) != 0 {
addr = fmt.Sprintf("%s:%s", ip, port) addr = fmt.Sprintf("%s:%s", ip, port)
return dialer.DialContext(ctx, network, addr) return dialer.DialContext(ctx, network, addr)
@ -1047,7 +1047,7 @@ func (d *Dnsfilter) createCustomDialContext(resolverAddr string) dialFunctionTyp
} }
if cache { if cache {
addToCache(host, a.String()) addToDialCache(host, a.String())
} }
return con, err return con, err
@ -1076,7 +1076,7 @@ func New(c *Config) *Dnsfilter {
ExpectContinueTimeout: 1 * time.Second, ExpectContinueTimeout: 1 * time.Second,
} }
if c != nil && len(c.ResolverAddress) != 0 { if c != nil && len(c.ResolverAddress) != 0 {
securityCache = gcache.New(2).LRU().Expiration(defaultCacheTime).Build() dialCache = gcache.New(2).LRU().Expiration(defaultCacheTime).Build()
d.transport.DialContext = d.createCustomDialContext(c.ResolverAddress) d.transport.DialContext = d.createCustomDialContext(c.ResolverAddress)
} }
d.client = http.Client{ d.client = http.Client{