black-internet-days-ahead/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2024-11-25 10:01:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix geosite path (#17)

Browse source 
`geoIPOptions` -> `geositeOptions`

Signed-off-by: Tianling Shen <i@cnsztl.eu.org>
This commit is contained in:
Tianling Shen 2022-08-18 10:00:56 +08:00 committed by GitHub
parent f22c2690ec
commit 7ead0de26b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
route/router.go
View file

@ -787,7 +787,7 @@ func (r *Router) prepareGeoIPDatabase() error {
func (r *Router) prepareGeositeDatabase() error { func (r *Router) prepareGeositeDatabase() error {
var geoPath string var geoPath string
if r.geositeOptions.Path != "" { if r.geositeOptions.Path != "" {
geoPath = r.geoIPOptions.Path geoPath = r.geositeOptions.Path
} else { } else {
geoPath = "geosite.db" geoPath = "geosite.db"
if foundPath, loaded := C.FindPath(geoPath); loaded { if foundPath, loaded := C.FindPath(geoPath); loaded {
@ -874,12 +874,12 @@ func (r *Router) downloadGeositeDatabase(savePath string) error {
} else { } else {
downloadURL = "https://github.com/SagerNet/sing-geosite/releases/latest/download/geosite.db" downloadURL = "https://github.com/SagerNet/sing-geosite/releases/latest/download/geosite.db"
} }
r.logger.Info("downloading geoip database") r.logger.Info("downloading geosite database")
var detour adapter.Outbound var detour adapter.Outbound
if r.geositeOptions.DownloadDetour != "" { if r.geositeOptions.DownloadDetour != "" {
outbound, loaded := r.Outbound(r.geositeOptions.DownloadDetour) outbound, loaded := r.Outbound(r.geositeOptions.DownloadDetour)
if !loaded { if !loaded {
return E.New("detour outbound not found: ", r.geoIPOptions.DownloadDetour) return E.New("detour outbound not found: ", r.geositeOptions.DownloadDetour)
} }
detour = outbound detour = outbound
} else { } else {