Skip to content

Update pires/proxyproto & Fix fallback error when original address is unix socket#182

Merged
RPRX merged 5 commits intoXTLS:mainfrom
bohanwood:pp-local
Jan 22, 2021
Merged

Update pires/proxyproto & Fix fallback error when original address is unix socket#182
RPRX merged 5 commits intoXTLS:mainfrom
bohanwood:pp-local

Conversation

@bohanwood
Copy link
Copy Markdown

@bohanwood bohanwood commented Jan 18, 2021

Fixes #166

还不确定完全没有问题

@bohanwood bohanwood marked this pull request as draft January 18, 2021 13:27
@bohanwood
Copy link
Copy Markdown
Author

上游 bug 已修复 pires/go-proxyproto#62 应该没有问题了

@bohanwood bohanwood marked this pull request as ready for review January 20, 2021 11:10
@RPRX
Copy link
Copy Markdown
Member

RPRX commented Jan 21, 2021

感谢跟进解决问题并 PR

@RPRX RPRX merged commit 5bc1bf3 into XTLS:main Jan 22, 2021
@RPRX
Copy link
Copy Markdown
Member

RPRX commented Jan 22, 2021

再次感谢

@bohanwood bohanwood deleted the pp-local branch January 22, 2021 03:30
github-actions bot added a commit to sbily1988/Xray-core that referenced this pull request Jan 22, 2021
* https://github.com/XTLS/Xray-core:
  v1.2.3
  Changes from v2fly-core (XTLS#173)
  Fix fallbacks xver when original address is not TCP address (XTLS#182)
  Convert domain names to lowercase before matching (XTLS#195)
  Feature: Exclude some domains in sniffing destOverride (XTLS#151)
  Regenerate .pb.go files (XTLS#187)
@RPRX
Copy link
Copy Markdown
Member

RPRX commented Jan 23, 2021

.Network() 判断方式存在问题,8ffc430

@RPRX
Copy link
Copy Markdown
Member

RPRX commented Jan 26, 2021

.Network() 判断方式存在问题,8ffc430

对了,问题仍然存在,应该是接收 PROXY protocol 的依赖炸了,Xray 同样的代码,依赖用 v0.4.x 获取不到传来的地址,v0.3.3 可以

具体场景为 VLESS fallbacks xver=1 时回落到 Trojan 和分流到 VMess

@bohanwood
Copy link
Copy Markdown
Author

有时间我再试一试

@bohanwood
Copy link
Copy Markdown
Author

简单试了一下 IPv4(VLESS 端口)xver 1 回落到 IPv4 (WebSocket VMESS)的,0.3.3 和 0.4.1 都可以正常获取地址。
问题具体是什么样的?debug 日志是什么?

@badO1a5A90
Copy link
Copy Markdown
Member

是接收有问题不是发送有问题。
比如前置Nginx,sni分流到VLESS,开启proxy protocol。
0.3.3版本时,xray能正常收到IP,0.4.x均不能。

@bohanwood
Copy link
Copy Markdown
Author

确实有问题

@bohanwood
Copy link
Copy Markdown
Author

已找到问题,开了修复的 PR pires/go-proxyproto#64

@bohanwood
Copy link
Copy Markdown
Author

上游 PR 已合并,可以更新一下依赖了

@RPRX
Copy link
Copy Markdown
Member

RPRX commented Jan 28, 2021

@bohanyang 好的,感谢

RPRX added a commit that referenced this pull request Jan 28, 2021
@RPRX
Copy link
Copy Markdown
Member

RPRX commented Jan 28, 2021

@bohanyang d032a8d

spider-yamet added a commit to spider-yamet/Xray-core that referenced this pull request Feb 19, 2023
rampagekiller0725 added a commit to rampagekiller0725/wox that referenced this pull request Jun 29, 2023
Autumn216 added a commit to Autumn216/wox that referenced this pull request Oct 31, 2023
it2konst pushed a commit to it2konst/gametunnel-core that referenced this pull request Mar 1, 2026
Co-authored-by: RPRX <63339210+rprx@users.noreply.github.com>
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
Co-authored-by: RPRX <63339210+rprx@users.noreply.github.com>
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.

不能正常接受 Proxy Protocol 的 LOCAL(本地请求)

3 participants