history-museum/Clash.Meta
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Chore: make the code more semantic

Browse Source
This commit is contained in:
Dreamacro
2018-09-30 12:25:52 +08:00
parent 220e4f0608
commit 2fd59cb31c
40 changed files with 102 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rules/domain_keyword.go
View File

@ -15,11 +15,11 @@ func (dk *DomainKeyword) RuleType() C.RuleType {
return C.DomainKeyword
}
func (dk *DomainKeyword) IsMatch(addr *C.Addr) bool {
if addr.AddrType != C.AtypDomainName {
func (dk *DomainKeyword) IsMatch(metadata *C.Metadata) bool {
if metadata.AddrType != C.AtypDomainName {
return false
}
domain := addr.Host
domain := metadata.Host
return strings.Contains(domain, dk.keyword)
}

6
rules/domain_suffix.go
View File

@ -15,11 +15,11 @@ func (ds *DomainSuffix) RuleType() C.RuleType {
return C.DomainSuffix
}
func (ds *DomainSuffix) IsMatch(addr *C.Addr) bool {
if addr.AddrType != C.AtypDomainName {
func (ds *DomainSuffix) IsMatch(metadata *C.Metadata) bool {
if metadata.AddrType != C.AtypDomainName {
return false
}
domain := addr.Host
domain := metadata.Host
return strings.HasSuffix(domain, "."+ds.suffix) || domain == ds.suffix
}

6
rules/domian.go
View File

@ -13,11 +13,11 @@ func (d *Domain) RuleType() C.RuleType {
return C.Domain
}
func (d *Domain) IsMatch(addr *C.Addr) bool {
if addr.AddrType != C.AtypDomainName {
func (d *Domain) IsMatch(metadata *C.Metadata) bool {
if metadata.AddrType != C.AtypDomainName {
return false
}
return addr.Host == d.domain
return metadata.Host == d.domain
}
func (d *Domain) Adapter() string {

2
rules/final.go
View File

@ -12,7 +12,7 @@ func (f *Final) RuleType() C.RuleType {
return C.FINAL
}
func (f *Final) IsMatch(addr *C.Addr) bool {
func (f *Final) IsMatch(metadata *C.Metadata) bool {
return true
}

6
rules/geoip.go
View File

@ -23,11 +23,11 @@ func (g *GEOIP) RuleType() C.RuleType {
return C.GEOIP
}
func (g *GEOIP) IsMatch(addr *C.Addr) bool {
if addr.IP == nil {
func (g *GEOIP) IsMatch(metadata *C.Metadata) bool {
if metadata.IP == nil {
return false
}
record, _ := mmdb.Country(*addr.IP)
record, _ := mmdb.Country(*metadata.IP)
return record.Country.IsoCode == g.country
}

6
rules/ipcidr.go
View File

@ -15,12 +15,12 @@ func (i *IPCIDR) RuleType() C.RuleType {
return C.IPCIDR
}
func (i *IPCIDR) IsMatch(addr *C.Addr) bool {
if addr.IP == nil {
func (i *IPCIDR) IsMatch(metadata *C.Metadata) bool {
if metadata.IP == nil {
return false
}
return i.ipnet.Contains(*addr.IP)
return i.ipnet.Contains(*metadata.IP)
}
func (i *IPCIDR) Adapter() string {