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

fix windows build after merge

Browse source
This commit is contained in:
Mykola Baibuz 2025-02-17 21:49:20 +02:00
parent c186be1788
commit 1fa96a09a0
1 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
service/server/killswitch.cpp
View file

@ -33,9 +33,6 @@ KillSwitch* KillSwitch::instance()
bool KillSwitch::init() bool KillSwitch::init()
{ {
#ifdef Q_OS_WIN
WindowsFirewall::instance()->init();
#endif
#ifdef Q_OS_LINUX #ifdef Q_OS_LINUX
if (!LinuxFirewall::isInstalled()) { if (!LinuxFirewall::isInstalled()) {
LinuxFirewall::install(); LinuxFirewall::install();
@ -97,7 +94,7 @@ bool KillSwitch::disableKillSwitch() {
if (isStrictKillSwitchEnabled()) { if (isStrictKillSwitchEnabled()) {
return disableAllTraffic(); return disableAllTraffic();
} }
return WindowsFirewall::instance()->allowAllTraffic(); return WindowsFirewall::create(this)->allowAllTraffic();
#endif #endif
return true; return true;
@ -106,7 +103,7 @@ bool KillSwitch::disableKillSwitch() {
bool KillSwitch::disableAllTraffic() { bool KillSwitch::disableAllTraffic() {
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
WindowsFirewall::instance()->enableKillSwitch(-1); WindowsFirewall::create(this)->enableInterface(-1);
#endif #endif
#ifdef Q_OS_LINUX #ifdef Q_OS_LINUX
if (!LinuxFirewall::isInstalled()) { if (!LinuxFirewall::isInstalled()) {
@ -192,7 +189,7 @@ bool KillSwitch::enablePeerTraffic(const QJsonObject &configStr) {
// killSwitch toggle // killSwitch toggle
if (QVariant(configStr.value(amnezia::config_key::killSwitchOption).toString()).toBool()) { if (QVariant(configStr.value(amnezia::config_key::killSwitchOption).toString()).toBool()) {
WindowsFirewall::instance()->enablePeerTraffic(config); WindowsFirewall::create(this)->enablePeerTraffic(config);
} }
WindowsDaemon::instance()->prepareActivation(config, inetAdapterIndex); WindowsDaemon::instance()->prepareActivation(config, inetAdapterIndex);
@ -203,7 +200,7 @@ bool KillSwitch::enablePeerTraffic(const QJsonObject &configStr) {
bool KillSwitch::enableKillSwitch(const QJsonObject &configStr, int vpnAdapterIndex) { bool KillSwitch::enableKillSwitch(const QJsonObject &configStr, int vpnAdapterIndex) {
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
return WindowsFirewall::instance()->enableKillSwitch(vpnAdapterIndex); return WindowsFirewall::create(this)->enableInterface(vpnAdapterIndex);
#endif #endif
#if defined(Q_OS_LINUX) || defined(Q_OS_MACOS) #if defined(Q_OS_LINUX) || defined(Q_OS_MACOS)