[PR #2187] [MERGED] fix: xray stability and split-tunneling #2695

New issue

Closed

opened 2026-10-14 21:04:04 +00:00 by bsakaguchi · 0 comments

bsakaguchi commented

2026-10-14 21:04:04 +00:00

Owner

📋 Pull Request Information

Original PR: https://github.com/amnezia-vpn/amnezia-client/pull/2187
Author: @ygurov
Created: 2/4/2026
Status: ✅ Merged
Merged: 2/11/2026
Merged by: @vkamn

Base: dev ← Head: fix/xray-crashes

📝 Commits (10+)

99a9852 fix: xray heap corruption
0aec0be fix: use proper configuration for split-tunneled apps
4ef3e03 chore: enable killswitch
687b758 chore: xray windows split-tunneling cleanup
55e6f3b chore: proper xray killswitch log
68aaa06 feat: add wait for the tun device
9f689dd chore: update amnezia_xray deps for macos
54350c3 fix: add nullptr check for split-tunnel on win
82f775f fix: modernize vpnAdapter grabbing function
7e57875 fix: remove network watcher due to its fragileness

📊 Changes

30 files changed (+396 additions, -555 deletions)

View changed files

📝 client/3rd-prebuilt (+1 -1)
📝 client/CMakeLists.txt (+0 -1)
📝 client/cmake/sources.cmake (+0 -2)
📝 client/core/ipcclient.cpp (+31 -57)
📝 client/core/ipcclient.h (+2 -17)
➖ client/core/privileged_process.cpp (+0 -27)
➖ client/core/privileged_process.h (+0 -24)
📝 client/platforms/windows/daemon/windowsdaemon.cpp (+3 -0)
📝 client/protocols/openvpnprotocol.cpp (+3 -9)
📝 client/protocols/openvpnprotocol.h (+1 -1)
📝 client/protocols/xrayprotocol.cpp (+182 -112)
📝 client/protocols/xrayprotocol.h (+7 -8)
📝 client/vpnconnection.cpp (+0 -105)
📝 client/vpnconnection.h (+0 -12)
📝 ipc/ipc.h (+57 -9)
📝 ipc/ipc_interface.rep (+2 -2)
📝 ipc/ipc_process_interface.rep (+7 -0)
➖ ipc/ipc_process_tun2socks.rep (+0 -11)
📝 ipc/ipcserver.cpp (+2 -2)
📝 ipc/ipcserver.h (+2 -6)

...and 10 more files

📄 Description

No description provided

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/amnezia-vpn/amnezia-client/pull/2187 **Author:** [@ygurov](https://github.com/ygurov) **Created:** 2/4/2026 **Status:** ✅ Merged **Merged:** 2/11/2026 **Merged by:** [@vkamn](https://github.com/vkamn) **Base:** `dev` ← **Head:** `fix/xray-crashes` --- ### 📝 Commits (10+) - [`99a9852`](https://github.com/amnezia-vpn/amnezia-client/commit/99a9852bd0febc03396fd8a2c23445e91b0e272c) fix: xray heap corruption - [`0aec0be`](https://github.com/amnezia-vpn/amnezia-client/commit/0aec0be2566caa90e37e9a2e9550463cc9bcf5e8) fix: use proper configuration for split-tunneled apps - [`4ef3e03`](https://github.com/amnezia-vpn/amnezia-client/commit/4ef3e031a795b337fcea8a7410e79b81433ce0c6) chore: enable killswitch - [`687b758`](https://github.com/amnezia-vpn/amnezia-client/commit/687b7582bc8898ffc4a308b9dcd826e46d6420a0) chore: xray windows split-tunneling cleanup - [`55e6f3b`](https://github.com/amnezia-vpn/amnezia-client/commit/55e6f3bb4f7e715102b444759d16fcad232cfe8f) chore: proper xray killswitch log - [`68aaa06`](https://github.com/amnezia-vpn/amnezia-client/commit/68aaa06d463862bb79259fb2342ded0d89d5aab0) feat: add wait for the tun device - [`9f689dd`](https://github.com/amnezia-vpn/amnezia-client/commit/9f689ddd4d448906a425c567cd44da77f145f728) chore: update amnezia_xray deps for macos - [`54350c3`](https://github.com/amnezia-vpn/amnezia-client/commit/54350c34c163bf0e0981157c915b2c47392beb15) fix: add nullptr check for split-tunnel on win - [`82f775f`](https://github.com/amnezia-vpn/amnezia-client/commit/82f775fdc88aae7a578a1d8f898a9c26c39fdad8) fix: modernize vpnAdapter grabbing function - [`7e57875`](https://github.com/amnezia-vpn/amnezia-client/commit/7e578755f22dca440d5f62334a3420f332d03593) fix: remove network watcher due to its fragileness ### 📊 Changes **30 files changed** (+396 additions, -555 deletions) <details> <summary>View changed files</summary> 📝 `client/3rd-prebuilt` (+1 -1) 📝 `client/CMakeLists.txt` (+0 -1) 📝 `client/cmake/sources.cmake` (+0 -2) 📝 `client/core/ipcclient.cpp` (+31 -57) 📝 `client/core/ipcclient.h` (+2 -17) ➖ `client/core/privileged_process.cpp` (+0 -27) ➖ `client/core/privileged_process.h` (+0 -24) 📝 `client/platforms/windows/daemon/windowsdaemon.cpp` (+3 -0) 📝 `client/protocols/openvpnprotocol.cpp` (+3 -9) 📝 `client/protocols/openvpnprotocol.h` (+1 -1) 📝 `client/protocols/xrayprotocol.cpp` (+182 -112) 📝 `client/protocols/xrayprotocol.h` (+7 -8) 📝 `client/vpnconnection.cpp` (+0 -105) 📝 `client/vpnconnection.h` (+0 -12) 📝 `ipc/ipc.h` (+57 -9) 📝 `ipc/ipc_interface.rep` (+2 -2) 📝 `ipc/ipc_process_interface.rep` (+7 -0) ➖ `ipc/ipc_process_tun2socks.rep` (+0 -11) 📝 `ipc/ipcserver.cpp` (+2 -2) 📝 `ipc/ipcserver.h` (+2 -6) _...and 10 more files_ </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

bsakaguchi

2026-10-14 21:04:04 +00:00

closed this issue
added the
pull-request
label

No labels

pull-request

No milestone

No project

No assignees

1 participant

Notifications

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

amnezia-vpn/amnezia-client#2695

No description provided.

Rows
Columns