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

精简trojan udp的处理代码 #142

Merged
merged 1 commit into from
Jan 8, 2021
Merged

精简trojan udp的处理代码 #142

merged 1 commit into from
Jan 8, 2021

Conversation

maskedeken
Copy link
Contributor

既然buf.Buffer里面已经带了UDPDestination,可以精简掉一些不必要的代码

@RPRX
Copy link
Member

RPRX commented Jan 8, 2021

感谢 PR,虽然也看到 v2ray 原本有 UDP 地址结构,但整个软件要兼容传递此结构所需的工程量过大,所以直接改 buffer 的结构了

不过剩下问题是并不是所有的 UDP buffer 都带地址(比如 VLESS、VMess 的暂无),我会看一下这里是否保持了兼容性

@RPRX RPRX merged commit d5aeb6c into XTLS:main Jan 8, 2021
@RPRX
Copy link
Member

RPRX commented Jan 8, 2021

引入了两个问题,已通过 fb0e517 修复

github-actions bot added a commit to sbily1988/Xray-core that referenced this pull request Jan 12, 2021
* https://github.com/XTLS/Xray-core: (31 commits)
  Support for VLESS & VMess UUID v5 mapping standard
  Trojan: Do not panic when UDP dispatcher failed to write response (XTLS#153)
  v1.2.1
  Improve configuration detector (cone or symmetric)
  16 -> 60, 8 -> 300
  Improve the response to UDP Associate in Socks5
  Adjust Trojan Outbound postRequest
  Adjust Trojan & Socks handleUDPPayload
  Refine Trojan packet reader & writer (XTLS#142)
  Fix TPROXY UDP/IPv6
  Optimized log (XTLS#121)
  v1.2.0
  Enable loading TOML & YAML by confdir (XTLS#120)
  Change TOML package to github.com/pelletier/go-toml (XTLS#119)
  Disable session resumption by default
  Refactor: TPROXY inbound UDP write back
  VLESS & VMess are not ready to accept FullCone yet
  Refactor: FullCone TPROXY Inbound & Socks Outbound
  Refactor: *net.UDPAddr -> *net.Destination
  Move common/net/connection.go into cnc folder
  ...
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