diff options
| author | David Lönnhager <david.l@mullvad.net> | 2020-01-21 13:26:05 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2020-01-31 16:24:48 +0100 |
| commit | 459d73b0dec7067387e6fffc55a3c0242ec1a6b2 (patch) | |
| tree | 326d256f5c95c5d34820348531ed67d133ec46d8 /windows/nsis-plugins/src/driverlogic/driverlogic.cpp | |
| parent | b029983278f35d342307693b77e0a7d66e3e5c06 (diff) | |
| download | mullvadvpn-459d73b0dec7067387e6fffc55a3c0242ec1a6b2.tar.xz mullvadvpn-459d73b0dec7067387e6fffc55a3c0242ec1a6b2.zip | |
Delete old-ID Mullvad TAP on updates
Diffstat (limited to 'windows/nsis-plugins/src/driverlogic/driverlogic.cpp')
| -rw-r--r-- | windows/nsis-plugins/src/driverlogic/driverlogic.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/windows/nsis-plugins/src/driverlogic/driverlogic.cpp b/windows/nsis-plugins/src/driverlogic/driverlogic.cpp index 4cd54f4ed0..8f00dbcecf 100644 --- a/windows/nsis-plugins/src/driverlogic/driverlogic.cpp +++ b/windows/nsis-plugins/src/driverlogic/driverlogic.cpp @@ -150,19 +150,19 @@ void __declspec(dllexport) NSISCALL EstablishBaseline } // -// RemoveMullvadTap +// RemoveOldMullvadTap // -// Deletes the Mullvad TAP adapter. +// Deletes the old Mullvad TAP adapter with ID tap0901. // // -enum class RemoveMullvadTapStatus +enum class RemoveOldMullvadTapStatus { GENERAL_ERROR = 0, SUCCESS_NO_REMAINING_TAP_ADAPTERS, SUCCESS_SOME_REMAINING_TAP_ADAPTERS }; -void __declspec(dllexport) NSISCALL RemoveMullvadTap +void __declspec(dllexport) NSISCALL RemoveOldMullvadTap ( HWND hwndParent, int string_size, @@ -178,17 +178,17 @@ void __declspec(dllexport) NSISCALL RemoveMullvadTap { pushstring(L""); - switch (Context::DeleteMullvadAdapter()) + switch (Context::DeleteOldMullvadAdapter()) { case Context::DeletionResult::NO_REMAINING_TAP_ADAPTERS: { - pushint(RemoveMullvadTapStatus::SUCCESS_NO_REMAINING_TAP_ADAPTERS); + pushint(RemoveOldMullvadTapStatus::SUCCESS_NO_REMAINING_TAP_ADAPTERS); break; } case Context::DeletionResult::SOME_REMAINING_TAP_ADAPTERS: { - pushint(RemoveMullvadTapStatus::SUCCESS_SOME_REMAINING_TAP_ADAPTERS); + pushint(RemoveOldMullvadTapStatus::SUCCESS_SOME_REMAINING_TAP_ADAPTERS); break; } @@ -201,12 +201,12 @@ void __declspec(dllexport) NSISCALL RemoveMullvadTap catch (std::exception &err) { pushstring(common::string::ToWide(err.what()).c_str()); - pushint(RemoveMullvadTapStatus::GENERAL_ERROR); + pushint(RemoveOldMullvadTapStatus::GENERAL_ERROR); } catch (...) { pushstring(L"Unspecified error"); - pushint(RemoveMullvadTapStatus::GENERAL_ERROR); + pushint(RemoveOldMullvadTapStatus::GENERAL_ERROR); } } |