mirrors/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2025-05-12 07:08:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix: matching type mismatch

Browse source
This commit is contained in:
JimhHan 2021-03-27 17:41:46 +08:00
parent 6471cfd290
commit b8196a22a0
No known key found for this signature in database
GPG key ID: 48D5D7CF95157AC5
3 changed files with 119 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

16
common/matcher/geosite/geosite.go
View file

@ -15,5 +15,19 @@ func ToDomains(dms []*Domain) []*domain.Domain {
}
func (d *Domain) ToDomain() *domain.Domain {
return &domain.Domain{Type: d.Type, Value: d.Value}
return &domain.Domain{Type: d.Type.ToMatchingType(), Value: d.Value}
}
func (t Domain_Type) ToMatchingType() domain.MatchingType {
switch t {
case Domain_Plain:
return domain.MatchingType_Keyword
case Domain_Regex:
return domain.MatchingType_Regex
case Domain_Domain:
return domain.MatchingType_Subdomain
case Domain_Full:
return domain.MatchingType_Full
}
panic("impossible")
}