Consolidate status enums in winnet

3 files changed, 25 insertions, 34 deletions

diff --git a/talpid-core/src/winnet.rs b/talpid-core/src/winnet.rs
index 3015369282..9fed90ac21 100644
--- a/talpid-core/src/winnet.rs
+++ b/talpid-core/src/winnet.rs
@@ -408,9 +408,9 @@ pub fn get_best_default_route(
             logging_context(),
         )
     } {
-        GetBestDefaultRouteStatus::Success => Ok(Some(default_route)),
-        GetBestDefaultRouteStatus::NotFound => Ok(None),
-        GetBestDefaultRouteStatus::Failure => Err(Error::GetDefaultRoute),
+        WinNetStatus::Success => Ok(Some(default_route)),
+        WinNetStatus::NotFound => Ok(None),
+        WinNetStatus::Failure => Err(Error::GetDefaultRoute),
     }
 }
 
@@ -430,9 +430,9 @@ pub fn interface_luid_to_ip(
             logging_context(),
         )
     } {
-        InterfaceLuidToIpAddressStatus::Success => Ok(Some(ip)),
-        InterfaceLuidToIpAddressStatus::NotFound => Ok(None),
-        InterfaceLuidToIpAddressStatus::Failure => Err(Error::GetIpAddressFromLuid),
+        WinNetStatus::Success => Ok(Some(ip)),
+        WinNetStatus::NotFound => Ok(None),
+        WinNetStatus::Failure => Err(Error::GetIpAddressFromLuid),
     }
 }
 
@@ -458,13 +458,11 @@ mod api {
 
     #[allow(dead_code)]
     #[repr(u32)]
-    pub enum FailableOptionalStatus {
+    pub enum WinNetStatus {
         Success = 0,
         NotFound = 1,
         Failure = 2,
     }
-    pub type GetBestDefaultRouteStatus = FailableOptionalStatus;
-    pub type InterfaceLuidToIpAddressStatus = FailableOptionalStatus;
 
     extern "system" {
         #[link_name = "WinNet_ActivateRouteManager"]
@@ -510,7 +508,7 @@ mod api {
             default_route: *mut super::WinNetDefaultRoute,
             sink: Option<LogSink>,
             sink_context: *const u8,
-        ) -> GetBestDefaultRouteStatus;
+        ) -> WinNetStatus;
 
         // TODO: Remove "allow(dead_code)" this is in use.
         #[allow(dead_code)]
@@ -521,7 +519,7 @@ mod api {
             ip: *mut super::WinNetIp,
             sink: Option<LogSink>,
             sink_context: *const u8,
-        ) -> InterfaceLuidToIpAddressStatus;
+        ) -> WinNetStatus;
 
         #[link_name = "WinNet_GetTapInterfaceAlias"]
         pub fn WinNet_GetTapInterfaceAlias(
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,