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

Merge pull request #791 from amnezia-vpn/feature/prevent-log-spam

Browse source 
Prevent service log spam on Windows
This commit is contained in:
pokamest 2024-05-07 14:45:26 -07:00 • committed by GitHub
commit 24759c92ad
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
client/platforms/windows/daemon/windowssplittunnel.cpp
View file

@ -18,6 +18,7 @@
#include <QFileInfo> #include <QFileInfo>
#include <QNetworkInterface> #include <QNetworkInterface>
#include <QScopeGuard> #include <QScopeGuard>
#include <QThread>
namespace { namespace {
Logger logger("WindowsSplitTunnel"); Logger logger("WindowsSplitTunnel");
@ -29,6 +30,9 @@ WindowsSplitTunnel::WindowsSplitTunnel(QObject* parent) : QObject(parent) {
uninstallDriver(); uninstallDriver();
return; return;
} }
m_tries = 0;
if (!isInstalled()) { if (!isInstalled()) {
logger.debug() << "Driver is not Installed, doing so"; logger.debug() << "Driver is not Installed, doing so";
auto handle = installDriver(); auto handle = installDriver();
@ -59,10 +63,10 @@ void WindowsSplitTunnel::initDriver() {
m_driver = CreateFileW(DRIVER_SYMLINK, GENERIC_READ | GENERIC_WRITE, 0, m_driver = CreateFileW(DRIVER_SYMLINK, GENERIC_READ | GENERIC_WRITE, 0,
nullptr, OPEN_EXISTING, 0, nullptr); nullptr, OPEN_EXISTING, 0, nullptr);
; ;
if (m_driver == INVALID_HANDLE_VALUE && m_tries < 500) {
if (m_driver == INVALID_HANDLE_VALUE) {
WindowsUtils::windowsLog("Failed to open Driver: "); WindowsUtils::windowsLog("Failed to open Driver: ");
m_tries++;
Sleep(100);
// If the handle is not present, try again after the serivce has started; // If the handle is not present, try again after the serivce has started;
auto driver_manager = WindowsServiceManager(DRIVER_SERVICE_NAME); auto driver_manager = WindowsServiceManager(DRIVER_SERVICE_NAME);
QObject::connect(&driver_manager, &WindowsServiceManager::serviceStarted, QObject::connect(&driver_manager, &WindowsServiceManager::serviceStarted,

1
client/platforms/windows/daemon/windowssplittunnel.h
View file

@ -158,6 +158,7 @@ class WindowsSplitTunnel final : public QObject {
constexpr static const auto MV_SERVICE_NAME = L"MullvadVPN"; constexpr static const auto MV_SERVICE_NAME = L"MullvadVPN";
DRIVER_STATE getState(); DRIVER_STATE getState();
int m_tries;
// Initializes the WFP Sublayer // Initializes the WFP Sublayer
bool initSublayer(); bool initSublayer();