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

Send tls fragment in one tcp packet if interval is zero #3663

Merged
merged 2 commits into from
Aug 10, 2024
Merged

Conversation

Fangliding
Copy link
Member

@Fangliding Fangliding commented Aug 9, 2024

#3660 (comment)
当interval为0时把分片写在一个包(同3660 简单一些 同时复用length等参数)
为什么不用 -1?
因为里面的值是uint(无符号整数) 不想改。 break proto是个坏习惯(吗)

TODO: support interval: 1/2(这必须要改类型了 那还不如把楼上改成int 如果有人做的话记得把值从0改成-1)

@radioactiveAHM
Copy link
Contributor

Much more dynamic and efficient. Well done! 🔥.

@RPRX
Copy link
Member

RPRX commented Aug 9, 2024

就先支持两个特殊值,一个 -1 一个 1/2 吧,虽然我好像记得 Golang TCP 会自动 combine? 还有记得写上原作者为 co-author

@RPRX
Copy link
Member

RPRX commented Aug 9, 2024

不过要支持 1/2 要把类型改成小数感觉不优雅,要不 -2 代表 1/2?但我又觉得用处不大,不太会影响 gfw 的识别能力,先 as-is 吧

@RPRX
Copy link
Member

RPRX commented Aug 10, 2024

对楼上我想说的是,当我在一个 PR 中建议修改时,就是打算合并这个 PR,请不要把 username 改成 VPN 来打广告,广告删了

@XTLS XTLS deleted a comment from netoronofficial Aug 10, 2024
@RPRX RPRX merged commit 9e93c19 into XTLS:main Aug 10, 2024
36 checks passed
@RPRX
Copy link
Member

RPRX commented Aug 10, 2024

@radioactiveAHM test this 9e93c19

@radioactiveAHM
Copy link
Contributor

@Fangliding @RPRX
Everything is working well. I tested it with a real configuration, and it performed perfectly. Great job and thank you!.
Screenshot 2024-08-10 121505

@netoronofficial
Copy link

@radioactiveAHM test this 9e93c19

你好,非常感谢您的帮助!希望这个能尽快被纳入到发布版本中。

再次感谢!❤️

@mmmray mmmray mentioned this pull request Aug 10, 2024
leninalive pushed a commit to amnezia-vpn/amnezia-xray-core that referenced this pull request Oct 29, 2024
Co-authored-by: RPRX <63339210+RPRX@users.noreply.github.com>
Co-authored-by: Ahmadreza Dorkhah <djahmadfire@gmail.com>
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.

4 participants