diff options
| author | Odd Stranne <odd@mullvad.net> | 2020-01-28 12:30:33 +0100 |
|---|---|---|
| committer | Odd Stranne <odd@mullvad.net> | 2020-01-28 14:29:08 +0100 |
| commit | 5ba8f62fb81f13f7ffa9b816ba33cbb814ce1417 (patch) | |
| tree | 02696149b415b628c4291274e8a4fe22b12f9dd4 /windows/libshared/src | |
| parent | f62a8069fc6dc602ec0e3c6c345714b280d0fba9 (diff) | |
| download | mullvadvpn-5ba8f62fb81f13f7ffa9b816ba33cbb814ce1417.tar.xz mullvadvpn-5ba8f62fb81f13f7ffa9b816ba33cbb814ce1417.zip | |
Use new exception macros
Diffstat (limited to 'windows/libshared/src')
| -rw-r--r-- | windows/libshared/src/libshared/network/interfaceutils.cpp | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/windows/libshared/src/libshared/network/interfaceutils.cpp b/windows/libshared/src/libshared/network/interfaceutils.cpp index 6d56ec82d2..c4a97105f5 100644 --- a/windows/libshared/src/libshared/network/interfaceutils.cpp +++ b/windows/libshared/src/libshared/network/interfaceutils.cpp @@ -39,7 +39,7 @@ InterfaceUtils::NetworkAdapter::NetworkAdapter( IID guidObj = { 0 }; if (S_OK != IIDFromString(&m_guid[0], &guidObj)) { - throw std::runtime_error("IIDFromString() failed"); + THROW_ERROR("IIDFromString() failed"); } m_alias = nci.getConnectionName(guidObj); @@ -59,7 +59,10 @@ std::set<InterfaceUtils::NetworkAdapter> InterfaceUtils::GetAllAdapters(ULONG fa auto status = GetAdaptersAddresses(family, flags, nullptr, nullptr, &bufferSize); - THROW_UNLESS(ERROR_BUFFER_OVERFLOW, status, "Probe for adapter listing buffer size"); + if (ERROR_BUFFER_OVERFLOW != status) + { + THROW_WINDOWS_ERROR(status, "Probe for adapter listing buffer size"); + } // Memory is cheap, this avoids a looping construct. bufferSize *= 2; @@ -69,7 +72,10 @@ std::set<InterfaceUtils::NetworkAdapter> InterfaceUtils::GetAllAdapters(ULONG fa status = GetAdaptersAddresses(family, flags, nullptr, addresses, &bufferSize); - THROW_UNLESS(ERROR_SUCCESS, status, "Retrieve adapter listing"); + if (ERROR_SUCCESS != status) + { + THROW_WINDOWS_ERROR(status, "Retrieve adapter listing"); + } std::set<NetworkAdapter> adapters; @@ -94,7 +100,12 @@ void InterfaceUtils::AddDeviceIpAddresses(NET_LUID device, const std::vector<SOC row.InterfaceLuid = device; row.Address = address; - THROW_UNLESS(NO_ERROR, CreateUnicastIpAddressEntry(&row), "Assign IP address on network interface"); + const auto status = CreateUnicastIpAddressEntry(&row); + + if (NO_ERROR != status) + { + THROW_WINDOWS_ERROR(status, "Assign IP address on network interface"); + } } } @@ -171,7 +182,7 @@ std::wstring InterfaceUtils::GetTapInterfaceAlias() } } - throw std::runtime_error("Unable to find TAP adapter"); + THROW_ERROR("Unable to find TAP adapter"); } } |