bughz/glider
1
0
Fork 0
mirror of https://github.com/nadoo/glider.git synced 2025-11-04 07:42:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

rule: optimized log format

Browse Source
This commit is contained in:
nadoo 2018-01-06 14:44:58 +08:00
parent 7d16530bae
commit 3c53bd9727
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
rule.go
View File

@ -34,19 +34,19 @@ func NewRuleDialer(rules []*RuleConf, gDialer Dialer) *RuleDialer {
forwarders = append(forwarders, forward)
}
sd := NewStrategyDialer(r.Strategy, forwarders, r.CheckWebSite, r.CheckDuration)
sDialer := NewStrategyDialer(r.Strategy, forwarders, r.CheckWebSite, r.CheckDuration)
for _, domain := range r.Domain {
rd.domainMap.Store(domain, sd)
rd.domainMap.Store(domain, sDialer)
}
for _, ip := range r.IP {
rd.ipMap.Store(ip, sd)
rd.ipMap.Store(ip, sDialer)
}
for _, s := range r.CIDR {
if _, cidr, err := net.ParseCIDR(s); err == nil {
rd.cidrMap.Store(cidr, sd)
rd.cidrMap.Store(cidr, sDialer)
}
}
@ -71,8 +71,8 @@ func (rd *RuleDialer) NextDialer(dstAddr string) Dialer {
// find ip
if ip := net.ParseIP(host); ip != nil {
// check ip
if d, ok := rd.ipMap.Load(ip.String()); ok {
return d.(Dialer)
if dialer, ok := rd.ipMap.Load(ip.String()); ok {
return dialer.(Dialer)
}
var ret Dialer
@ -99,8 +99,8 @@ func (rd *RuleDialer) NextDialer(dstAddr string) Dialer {
domain := strings.Join(domainParts[i:length], ".")
// find in domainMap
if d, ok := rd.domainMap.Load(domain); ok {
return d.(Dialer)
if dialer, ok := rd.domainMap.Load(domain); ok {
return dialer.(Dialer)
}
}
@ -118,12 +118,12 @@ func (rd *RuleDialer) AddDomainIP(domain, ip string) error {
domainParts := strings.Split(domain, ".")
length := len(domainParts)
for i := length - 2; i >= 0; i-- {
domain := strings.Join(domainParts[i:length], ".")
pDomain := strings.Join(domainParts[i:length], ".")
// find in domainMap
if d, ok := rd.domainMap.Load(domain); ok {
rd.ipMap.Store(ip, d)
logf("rule: add domain: %s, ip: %s\n", domain, ip)
if dialer, ok := rd.domainMap.Load(pDomain); ok {
rd.ipMap.Store(ip, dialer)
logf("rule add `ip=%s`, based on rule: `domain=%s`, domain/ip: %s/%s\n", ip, pDomain, domain, ip)
}
}