AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some pretty fixes

Browse source
This commit is contained in:
Mykola Baibuz 2025-03-13 22:04:03 +02:00
parent 2206b4a2dd
commit a120f3d5bd
7 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
client/platforms/windows/daemon/windowsfirewall.cpp
View file

@ -192,7 +192,7 @@ bool WindowsFirewall::enableInterface(int vpnAdapterIndex) {
}
IPAddress allv6("::/0");
if (!blockTrafficTo(allv6, MED_WEIGHT,
"Block Internet", "killswitch")) {
"Block Internet", "killswitch")) {
return false;
}
} else
@ -203,8 +203,8 @@ bool WindowsFirewall::enableInterface(int vpnAdapterIndex) {
FW_OK(allowTrafficForAppOnAll(getCurrentPath(), MAX_WEIGHT,
"Allow all for AmneziaVPN.exe"));
FW_OK(blockTrafficOnPort(53, MED_WEIGHT, "Block all DNS"));
FW_OK(
allowLoopbackTraffic(MED_WEIGHT, "Allow Loopback traffic on device %1"));
FW_OK(allowLoopbackTraffic(MED_WEIGHT,
"Allow Loopback traffic on device %1"));
logger.debug() << "Killswitch on! Rules:" << m_activeRules.length();
return true;
@ -290,7 +290,7 @@ bool WindowsFirewall::enablePeerTraffic(const InterfaceConfig& config) {
logger.debug() << "excludedAddresses range: " << i;
if (!allowTrafficTo(i, HIGH_WEIGHT,
"Allow Ecxlude route", config.m_serverPublicKey)) {
"Allow Ecxlude route", config.m_serverPublicKey)) {
return false;
}
}

1
client/ui/controllers/settingsController.cpp
View file

@ -251,7 +251,6 @@ void SettingsController::toggleKillSwitch(bool enable)
} else {
emit strictKillSwitchEnabledChanged(isStrictKillSwitchEnabled());
}
}
bool SettingsController::isStrictKillSwitchEnabled()

2
client/ui/qml/Controls2/BaseHeaderType.qml
View file

@ -42,4 +42,4 @@ Item {
visible: root.descriptionText !== ""
}
}
}
}

2
client/ui/qml/Controls2/HeaderTypeWithButton.qml
View file

@ -41,4 +41,4 @@ BaseHeaderType {
actionButtonFunction()
}
}
}
}

2
client/ui/qml/Controls2/HeaderTypeWithSwitcher.qml
View file

@ -25,4 +25,4 @@ BaseHeaderType {
}
}
}
}
}

6
client/ui/qml/Pages2/PageSettingsKillSwitch.qml
View file

@ -37,7 +37,7 @@ PageType {
Layout.leftMargin: 16
Layout.rightMargin: 16
headerText: qsTr("Kill Switch")
headerText: qsTr("KillSwitch")
descriptionText: qsTr("Enable to ensure network traffic goes through a secure VPN tunnel, preventing accidental exposure of your IP and DNS queries if the connection drops")
showSwitcher: true
@ -65,7 +65,7 @@ PageType {
enabled: SettingsController.isKillSwitchEnabled && !ConnectionController.isConnected
checked: !SettingsController.strictKillSwitchEnabled
text: qsTr("Soft Kill Switch")
text: qsTr("Soft KillSwitch")
descriptionText: qsTr("Internet connection is blocked if VPN connection drops accidentally")
onClicked: {
@ -84,7 +84,7 @@ PageType {
enabled: SettingsController.isKillSwitchEnabled && !ConnectionController.isConnected
checked: SettingsController.strictKillSwitchEnabled
text: qsTr("Strict Kill Switch")
text: qsTr("Strict KillSwitch")
descriptionText: qsTr("Internet connection is blocked even if VPN was turned off manually or not started")
onClicked: {

4
service/server/killswitch.h
View file

@ -15,8 +15,8 @@ public:
bool refresh(bool enabled);
bool disableKillSwitch();
bool disableAllTraffic();
bool enablePeerTraffic( const QJsonObject &configStr);
bool enableKillSwitch( const QJsonObject &configStr, int vpnAdapterIndex);
bool enablePeerTraffic(const QJsonObject &configStr);
bool enableKillSwitch(const QJsonObject &configStr, int vpnAdapterIndex);
bool allowTrafficTo(const QStringList &ranges);
bool isStrictKillSwitchEnabled();