Skip to content

Chore: Refactor infra/conf.TestToCidrList()#4017

Merged
yuhan6665 merged 1 commit intoXTLS:mainfrom
zonescape:infra-geoip
Nov 14, 2024
Merged

Chore: Refactor infra/conf.TestToCidrList()#4017
yuhan6665 merged 1 commit intoXTLS:mainfrom
zonescape:infra-geoip

Conversation

@zonescape
Copy link
Contributor

Improvements:

  • drop init() functions, use more straightforward code
  • don't write geoip.dat into the project directory*
  • don't write geoip.dat twice

*geoip.dat is written into the project directory if you have that file in ./resources only:

  • init() function in dns_test.go sets environment variable xray.location.asset to os.Getwd() i.e. to infra/conf
  • init() function in router_test.go writes geoip.dat to platform.GetAssetLocation() i.e. to infra/conf

@yuhan6665 yuhan6665 merged commit ec1fd00 into XTLS:main Nov 14, 2024
@yuhan6665
Copy link
Member

Thanks! Looks good to me

it2konst pushed a commit to it2konst/gametunnel-core that referenced this pull request Mar 1, 2026
drovosek229 pushed a commit to drovosek229/Xray-core that referenced this pull request Mar 16, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants