[PR #746] [MERGED] added killSwitch switcher #2079

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

📋 Pull Request Information

Original PR: https://github.com/amnezia-vpn/amnezia-client/pull/746
Author: @Nethius
Created: 4/9/2024
Status: ✅ Merged
Merged: 4/25/2024
Merged by: @pokamest

Base: dev ← Head: feature/killswitch-switcher


📝 Commits (10+)

  • ee64292 added killSwitch switcher
  • fb529a9 KillSwitch toggle for OpenVPN and XRay
  • 7c73061 killSwitch toggle for AWG/WG protocol
  • 63c9e67 Some Win fixes for WG/AWG
  • aaf833b prohibit changing killswitch settings while the connection is active
  • 767d153 Merge branch 'feature/killswitch-switcher' of github.com:amnezia-vpn/amnezia-client into feature/killswitch-switcher
  • 34317f6 Win fixes for XRay and OpenVPN
  • d6d6460 Merge branch 'dev' into feature/killswitch-switcher
  • ba1cb9a Merge branch 'dev' into feature/killswitch-switcher
  • 02441f1 Some XRay fixes for Linux

📊 Changes

21 files changed (+144 additions, -58 deletions)

View changed files

📝 client/configurators/openvpn_configurator.cpp (+2 -2)
📝 client/daemon/daemon.cpp (+2 -0)
📝 client/daemon/interfaceconfig.h (+1 -0)
📝 client/mozilla/localsocketcontroller.cpp (+3 -1)
📝 client/platforms/linux/daemon/wireguardutilslinux.cpp (+16 -15)
📝 client/platforms/macos/daemon/wireguardutilsmacos.cpp (+13 -13)
📝 client/platforms/windows/daemon/wireguardutilswindows.cpp (+10 -7)
📝 client/protocols/openvpnprotocol.cpp (+8 -2)
📝 client/protocols/protocols_defs.h (+2 -0)
📝 client/protocols/xrayprotocol.cpp (+11 -3)
📝 client/settings.cpp (+12 -2)
📝 client/settings.h (+4 -2)
📝 client/ui/controllers/settingsController.cpp (+10 -0)
📝 client/ui/controllers/settingsController.h (+3 -0)
📝 client/ui/models/appSplitTunnelingModel.cpp (+1 -1)
📝 client/ui/models/sites_model.cpp (+1 -1)
📝 client/ui/qml/Pages2/PageSettingsBackup.qml (+2 -3)
📝 client/ui/qml/Pages2/PageSettingsConnection.qml (+25 -0)
📝 client/vpnconnection.cpp (+12 -5)
📝 client/vpnconnection.h (+1 -0)

...and 1 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/746 **Author:** [@Nethius](https://github.com/Nethius) **Created:** 4/9/2024 **Status:** ✅ Merged **Merged:** 4/25/2024 **Merged by:** [@pokamest](https://github.com/pokamest) **Base:** `dev` ← **Head:** `feature/killswitch-switcher` --- ### 📝 Commits (10+) - [`ee64292`](https://github.com/amnezia-vpn/amnezia-client/commit/ee64292d171ba7df478e08f0737f3a58961779aa) added killSwitch switcher - [`fb529a9`](https://github.com/amnezia-vpn/amnezia-client/commit/fb529a93de7ee76b941e56682a219cccee1dd168) KillSwitch toggle for OpenVPN and XRay - [`7c73061`](https://github.com/amnezia-vpn/amnezia-client/commit/7c7306118fdacda1de39a246af36eb72246877a2) killSwitch toggle for AWG/WG protocol - [`63c9e67`](https://github.com/amnezia-vpn/amnezia-client/commit/63c9e6716527ad149035fc8aed6ef0f954e0459a) Some Win fixes for WG/AWG - [`aaf833b`](https://github.com/amnezia-vpn/amnezia-client/commit/aaf833beb1e143b6cd99c5609394d06b997c5871) prohibit changing killswitch settings while the connection is active - [`767d153`](https://github.com/amnezia-vpn/amnezia-client/commit/767d153fd5ae6d3612163317ffc64189624145bd) Merge branch 'feature/killswitch-switcher' of github.com:amnezia-vpn/amnezia-client into feature/killswitch-switcher - [`34317f6`](https://github.com/amnezia-vpn/amnezia-client/commit/34317f67ae67c65ed631e876753b27a6e661c617) Win fixes for XRay and OpenVPN - [`d6d6460`](https://github.com/amnezia-vpn/amnezia-client/commit/d6d646001369c472aec40a602a5dcfd0b902ffef) Merge branch 'dev' into feature/killswitch-switcher - [`ba1cb9a`](https://github.com/amnezia-vpn/amnezia-client/commit/ba1cb9a8cc02470156991182124b21f9edb8f3dd) Merge branch 'dev' into feature/killswitch-switcher - [`02441f1`](https://github.com/amnezia-vpn/amnezia-client/commit/02441f1ee9444ec3227eef9aba6300e534d91a80) Some XRay fixes for Linux ### 📊 Changes **21 files changed** (+144 additions, -58 deletions) <details> <summary>View changed files</summary> 📝 `client/configurators/openvpn_configurator.cpp` (+2 -2) 📝 `client/daemon/daemon.cpp` (+2 -0) 📝 `client/daemon/interfaceconfig.h` (+1 -0) 📝 `client/mozilla/localsocketcontroller.cpp` (+3 -1) 📝 `client/platforms/linux/daemon/wireguardutilslinux.cpp` (+16 -15) 📝 `client/platforms/macos/daemon/wireguardutilsmacos.cpp` (+13 -13) 📝 `client/platforms/windows/daemon/wireguardutilswindows.cpp` (+10 -7) 📝 `client/protocols/openvpnprotocol.cpp` (+8 -2) 📝 `client/protocols/protocols_defs.h` (+2 -0) 📝 `client/protocols/xrayprotocol.cpp` (+11 -3) 📝 `client/settings.cpp` (+12 -2) 📝 `client/settings.h` (+4 -2) 📝 `client/ui/controllers/settingsController.cpp` (+10 -0) 📝 `client/ui/controllers/settingsController.h` (+3 -0) 📝 `client/ui/models/appSplitTunnelingModel.cpp` (+1 -1) 📝 `client/ui/models/sites_model.cpp` (+1 -1) 📝 `client/ui/qml/Pages2/PageSettingsBackup.qml` (+2 -3) 📝 `client/ui/qml/Pages2/PageSettingsConnection.qml` (+25 -0) 📝 `client/vpnconnection.cpp` (+12 -5) 📝 `client/vpnconnection.h` (+1 -0) _...and 1 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-13 21:18:19 +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#2079
No description provided.