diff options
| author | David Lönnhager <david.l@mullvad.net> | 2020-09-15 13:48:31 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2020-11-09 14:54:58 +0100 |
| commit | e429e5caa1cf783b05fc4db3880b41dea02d509c (patch) | |
| tree | 7d53715b91e3590b3681d1d31b9febcf5b547d44 /windows/winnet/src | |
| parent | 47f9f4c76103771adeb992d0ce7ed5540f6b15a8 (diff) | |
| download | mullvadvpn-e429e5caa1cf783b05fc4db3880b41dea02d509c.tar.xz mullvadvpn-e429e5caa1cf783b05fc4db3880b41dea02d509c.zip | |
Consolidate status enums in winnet
Diffstat (limited to 'windows/winnet/src')
| -rw-r--r-- | windows/winnet/src/winnet/winnet.cpp | 20 | ||||
| -rw-r--r-- | windows/winnet/src/winnet/winnet.h | 19 |
2 files changed, 16 insertions, 23 deletions
diff --git a/windows/winnet/src/winnet/winnet.cpp b/windows/winnet/src/winnet/winnet.cpp index 343c9e146d..50332a85e6 100644 --- a/windows/winnet/src/winnet/winnet.cpp +++ b/windows/winnet/src/winnet/winnet.cpp @@ -95,7 +95,7 @@ WinNet_EnableIpv6ForAdapter( extern "C"
WINNET_LINKAGE
-WINNET_GBDR_STATUS
+WINNET_STATUS
WINNET_API
WinNet_GetBestDefaultRoute(
WINNET_ADDR_FAMILY family,
@@ -122,29 +122,29 @@ WinNet_GetBestDefaultRoute( if (!ifaceAndGateway.has_value())
{
- return WINNET_GBDR_STATUS_NOT_FOUND;
+ return WINNET_STATUS_NOT_FOUND;
}
route->interfaceLuid = ifaceAndGateway->iface.Value;
const auto ips = winnet::ConvertNativeAddresses(&ifaceAndGateway->gateway, 1);
route->gateway = ips[0];
- return WINNET_GBDR_STATUS_SUCCESS;
+ return WINNET_STATUS_SUCCESS;
}
catch (const std::exception & err)
{
shared::logging::UnwindAndLog(logSink, logSinkContext, err);
- return WINNET_GBDR_STATUS_FAILURE;
+ return WINNET_STATUS_FAILURE;
}
catch (...)
{
- return WINNET_GBDR_STATUS_FAILURE;
+ return WINNET_STATUS_FAILURE;
}
}
extern "C"
WINNET_LINKAGE
-WINNET_ILTIA_STATUS
+WINNET_STATUS
WINNET_API
WinNet_InterfaceLuidToIpAddress(
WINNET_ADDR_FAMILY family,
@@ -195,19 +195,19 @@ WinNet_InterfaceLuidToIpAddress( const auto ips = winnet::ConvertNativeAddresses(&entry.Address, 1);
*ip = ips[0];
- return WINNET_ILTIA_STATUS_SUCCESS;
+ return WINNET_STATUS_SUCCESS;
}
- return WINNET_ILTIA_STATUS_NOT_FOUND;
+ return WINNET_STATUS_NOT_FOUND;
}
catch (const std::exception & err)
{
shared::logging::UnwindAndLog(logSink, logSinkContext, err);
- return WINNET_ILTIA_STATUS_FAILURE;
+ return WINNET_STATUS_FAILURE;
}
catch (...)
{
- return WINNET_ILTIA_STATUS_FAILURE;
+ return WINNET_STATUS_FAILURE;
}
}
diff --git a/windows/winnet/src/winnet/winnet.h b/windows/winnet/src/winnet/winnet.h index 8cb5691a60..0da271274e 100644 --- a/windows/winnet/src/winnet/winnet.h +++ b/windows/winnet/src/winnet/winnet.h @@ -187,16 +187,16 @@ typedef struct tag_WINNET_DEFAULT_ROUTE } WINNET_DEFAULT_ROUTE; -enum WINNET_GBDR_STATUS +enum WINNET_STATUS { - WINNET_GBDR_STATUS_SUCCESS = 0, - WINNET_GBDR_STATUS_NOT_FOUND = 1, - WINNET_GBDR_STATUS_FAILURE = 2, + WINNET_STATUS_SUCCESS = 0, + WINNET_STATUS_NOT_FOUND = 1, + WINNET_STATUS_FAILURE = 2, }; extern "C" WINNET_LINKAGE -WINNET_GBDR_STATUS +WINNET_STATUS WINNET_API WinNet_GetBestDefaultRoute( WINNET_ADDR_FAMILY family, @@ -205,16 +205,9 @@ WinNet_GetBestDefaultRoute( void *logSinkContext ); -enum WINNET_ILTIA_STATUS -{ - WINNET_ILTIA_STATUS_SUCCESS = 0, - WINNET_ILTIA_STATUS_NOT_FOUND = 1, - WINNET_ILTIA_STATUS_FAILURE = 2, -}; - extern "C" WINNET_LINKAGE -WINNET_ILTIA_STATUS +WINNET_STATUS WINNET_API WinNet_InterfaceLuidToIpAddress( WINNET_ADDR_FAMILY family, |