[PR #1075] [MERGED] Some XRay improvements #2229

Closed
opened 2026-10-13 21:19:55 +00:00 by bsakaguchi · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/amnezia-vpn/amnezia-client/pull/1075
Author: @outspace
Created: 9/19/2024
Status: ✅ Merged
Merged: 9/20/2024
Merged by: @pokamest

Base: dev ← Head: feature/tun2socksSrv


📝 Commits (7)

  • 0863e69 Move tun2socks process to service
  • 0afe0d3 Resolve DNS names in killswitch
  • f2c1564 Merge branch 'dev' into feature/tun2socksSrv
  • 776ec50 Some updates for DNS name resolving
  • 77f8a14 Fix MacOS connection status
  • 3022230 Merge branch 'dev' into feature/tun2socksSrv
  • 871586d Tiny Xray fixes

📊 Changes

16 files changed (+237 additions, -107 deletions)

View changed files

📝 client/CMakeLists.txt (+1 -0)
📝 client/core/ipcclient.cpp (+14 -2)
📝 client/core/ipcclient.h (+5 -0)
📝 client/protocols/openvpnprotocol.cpp (+5 -3)
📝 client/protocols/xrayprotocol.cpp (+60 -95)
📝 client/protocols/xrayprotocol.h (+2 -1)
📝 ipc/ipc_interface.rep (+0 -1)
📝 ipc/ipc_process_interface.rep (+0 -1)
➕ ipc/ipc_process_tun2socks.rep (+11 -0)
📝 ipc/ipcserver.cpp (+4 -4)
📝 ipc/ipcserver.h (+4 -0)
➕ ipc/ipctun2socksprocess.cpp (+74 -0)
➕ ipc/ipctun2socksprocess.h (+52 -0)
📝 service/server/CMakeLists.txt (+3 -0)
📝 service/server/localserver.cpp (+1 -0)
📝 service/server/localserver.h (+1 -0)

📄 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/1075 **Author:** [@outspace](https://github.com/outspace) **Created:** 9/19/2024 **Status:** ✅ Merged **Merged:** 9/20/2024 **Merged by:** [@pokamest](https://github.com/pokamest) **Base:** `dev` ← **Head:** `feature/tun2socksSrv` --- ### 📝 Commits (7) - [`0863e69`](https://github.com/amnezia-vpn/amnezia-client/commit/0863e69d0ab9421f3f4b0a83f018e7f3e68c7bdd) Move tun2socks process to service - [`0afe0d3`](https://github.com/amnezia-vpn/amnezia-client/commit/0afe0d3341cb14b001ff1ebacde310b5848ef206) Resolve DNS names in killswitch - [`f2c1564`](https://github.com/amnezia-vpn/amnezia-client/commit/f2c1564d6c236f1c6c436ee594d644a456474c0f) Merge branch 'dev' into feature/tun2socksSrv - [`776ec50`](https://github.com/amnezia-vpn/amnezia-client/commit/776ec50c54099300aa0ddb5dd44a5830ebc42c4f) Some updates for DNS name resolving - [`77f8a14`](https://github.com/amnezia-vpn/amnezia-client/commit/77f8a1401bf7bf796de084bcd62c368708618b0e) Fix MacOS connection status - [`3022230`](https://github.com/amnezia-vpn/amnezia-client/commit/302223051f6c7b8e29fe497a692f953a39ef46a0) Merge branch 'dev' into feature/tun2socksSrv - [`871586d`](https://github.com/amnezia-vpn/amnezia-client/commit/871586df0c708d669fbfbd89c3b5f7528552dbd6) Tiny Xray fixes ### 📊 Changes **16 files changed** (+237 additions, -107 deletions) <details> <summary>View changed files</summary> 📝 `client/CMakeLists.txt` (+1 -0) 📝 `client/core/ipcclient.cpp` (+14 -2) 📝 `client/core/ipcclient.h` (+5 -0) 📝 `client/protocols/openvpnprotocol.cpp` (+5 -3) 📝 `client/protocols/xrayprotocol.cpp` (+60 -95) 📝 `client/protocols/xrayprotocol.h` (+2 -1) 📝 `ipc/ipc_interface.rep` (+0 -1) 📝 `ipc/ipc_process_interface.rep` (+0 -1) ➕ `ipc/ipc_process_tun2socks.rep` (+11 -0) 📝 `ipc/ipcserver.cpp` (+4 -4) 📝 `ipc/ipcserver.h` (+4 -0) ➕ `ipc/ipctun2socksprocess.cpp` (+74 -0) ➕ `ipc/ipctun2socksprocess.h` (+52 -0) 📝 `service/server/CMakeLists.txt` (+3 -0) 📝 `service/server/localserver.cpp` (+1 -0) 📝 `service/server/localserver.h` (+1 -0) </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-13 21:19:55 +00:00
Sign in to join this conversation.
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#2229
No description provided.