diff options
| author | David Lönnhager <david.l@mullvad.net> | 2021-12-07 14:40:22 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2021-12-07 14:40:22 +0100 |
| commit | 5fa6d87ef42bc3452d13e8149b11fd26386b6a83 (patch) | |
| tree | cd50e7a85952cde802dbc018958305c3e506fb40 /windows | |
| parent | f646fcd1607129e3823acd2ff104f5c8dc001772 (diff) | |
| parent | 1491c9d0462da46caa7250a50c5451bf50659d84 (diff) | |
| download | mullvadvpn-5fa6d87ef42bc3452d13e8149b11fd26386b6a83.tar.xz mullvadvpn-5fa6d87ef42bc3452d13e8149b11fd26386b6a83.zip | |
Merge branch 'wg-nt-update'
Diffstat (limited to 'windows')
| -rw-r--r-- | windows/driverlogic/src/driverlogic.cpp | 16 | ||||
| -rw-r--r-- | windows/driverlogic/src/wireguard.h | 6 |
2 files changed, 7 insertions, 15 deletions
diff --git a/windows/driverlogic/src/driverlogic.cpp b/windows/driverlogic/src/driverlogic.cpp index 3cb1739e21..aba746d3e3 100644 --- a/windows/driverlogic/src/driverlogic.cpp +++ b/windows/driverlogic/src/driverlogic.cpp @@ -283,24 +283,16 @@ ReturnCode CommandWireGuardNtCleanup(const std::vector<std::wstring> &args) { ArgumentContext argsContext(args); - argsContext.ensureExactArgumentCount(1); - - const auto poolName = argsContext.next(); + argsContext.ensureExactArgumentCount(0); WireGuardNtDll wgNt; - BOOL rebootRequired; - - if (FALSE == wgNt.deletePoolDriver(poolName.c_str(), &rebootRequired)) + if (FALSE == wgNt.deleteDriver()) { - throw std::runtime_error("Failed to delete WireGuardNT pool"); + throw std::runtime_error("Failed to delete WireGuardNT driver"); } - std::wstringstream ss; - - ss << L"Successfully deleted WireGuardNT pool. Reboot required: " << rebootRequired; - - Log(ss.str()); + Log(L"Successfully deleted WireGuardNT driver"); return ReturnCode::GENERAL_SUCCESS; } diff --git a/windows/driverlogic/src/wireguard.h b/windows/driverlogic/src/wireguard.h index 5892b248f1..e99da56c05 100644 --- a/windows/driverlogic/src/wireguard.h +++ b/windows/driverlogic/src/wireguard.h @@ -10,7 +10,7 @@ public: WireGuardNtDll() : dllHandle(nullptr) { - auto path = GetProcessModulePath().replace_filename(L"wireguard.dll"); + auto path = GetProcessModulePath().replace_filename(L"mullvad-wireguard.dll"); dllHandle = LoadLibraryExW(path.c_str(), nullptr, LOAD_WITH_ALTERED_SEARCH_PATH); if (nullptr == dllHandle) @@ -20,7 +20,7 @@ public: try { - deletePoolDriver = getProcAddressOrThrow<WIREGUARD_DELETE_POOL_DRIVER_FUNC*>("WireGuardDeletePoolDriver"); + deleteDriver = getProcAddressOrThrow<WIREGUARD_DELETE_DRIVER_FUNC*>("WireGuardDeleteDriver"); } catch (...) { @@ -37,7 +37,7 @@ public: } } - WIREGUARD_DELETE_POOL_DRIVER_FUNC *deletePoolDriver; + WIREGUARD_DELETE_DRIVER_FUNC *deleteDriver; private: |