Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes #512: geo download failed when startup #538

Merged
merged 3 commits into from
May 1, 2023
Merged

Conversation

sleshep
Copy link

@sleshep sleshep commented Apr 30, 2023

  • 启动阶段,executor还未初始化tunnel,tcpIn==nil导致geo下载失败,阻塞在 tcpIn <- context

@Skyxim
Copy link
Collaborator

Skyxim commented Apr 30, 2023

那个 HTTP 的超时设置没有意义啊,HTTP 自己有控制参数
Inner 那里如果要在没有 TcpIn 时使用直连,应该利用 clash 自己的 dialer 产生 TCP 连接(不然可能出现流量回环),但是在没有初始化之前其实也无法做到(会有很多问题)。通过 Inner 下载 GeoX 现在处于完全不可为状态
如果想通过 Inner 下载需要延迟加载 GeoX ,至少 https://github.com/MetaCubeX/Clash.Meta/blob/a4334e1d52afe75daf00c87088e14287df404116/hub/executor/executor.go#LL104C16-L104C16 在这之后
并需要解决如果遇到没有加载的 Geo 规则时,匹配处理
现在这样的处理,如果在 Tun 模式下会产生回环,也会导致无法加载

@Skyxim
Copy link
Collaborator

Skyxim commented Apr 30, 2023

抱歉,看错了,的确可以在这里会退到普通直连,这里,GeoX 会强制最先加载

@sleshep
Copy link
Author

sleshep commented May 1, 2023

那个 HTTP 的超时设置没有意义啊,HTTP 自己有控制参数 Inner 那里如果要在没有 TcpIn 时使用直连,应该利用 clash 自己的 dialer 产生 TCP 连接(不然可能出现流量回环),但是在没有初始化之前其实也无法做到(会有很多问题)。通过 Inner 下载 GeoX 现在处于完全不可为状态 如果想通过 Inner 下载需要延迟加载 GeoX ,至少 https://github.com/MetaCubeX/Clash.Meta/blob/a4334e1d52afe75daf00c87088e14287df404116/hub/executor/executor.go#LL104C16-L104C16 在这之后 并需要解决如果遇到没有加载的 Geo 规则时,匹配处理 现在这样的处理,如果在 Tun 模式下会产生回环,也会导致无法加载

好的,去掉了ctx。

@Skyxim Skyxim changed the base branch from Meta to Alpha May 1, 2023 13:00
@Skyxim Skyxim changed the base branch from Alpha to Meta May 1, 2023 13:00
- 启动阶段,executor还未初始化tunnel,tcpIn==nil导致geo下载失败,阻塞在
  tcpIn <- context
@Skyxim Skyxim changed the base branch from Meta to Alpha May 1, 2023 13:08
@Skyxim Skyxim merged commit 463da57 into MetaCubeX:Alpha May 1, 2023
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.

None yet

2 participants