One RouteManagerCommand per OS

Author: dlon

talpid-routing/src/unix/mod.rs

@@ -72,6 +72,7 @@ impl Error {
 type Fwmark = u32;
 
 /// Commands for the underlying route manager object.
+#[cfg(target_os = "linux")]
 #[derive(Debug)]
 pub(crate) enum RouteManagerCommand {
     AddRoutes(
@@ -80,32 +81,47 @@ pub(crate) enum RouteManagerCommand {
     ),
     ClearRoutes,
     Shutdown(oneshot::Sender<()>),
-    #[cfg(target_os = "macos")]
-    RefreshRoutes,
-    #[cfg(target_os = "macos")]
-    NewDefaultRouteListener(oneshot::Sender<mpsc::UnboundedReceiver<DefaultRouteEvent>>),
-    #[cfg(target_os = "macos")]
-    GetDefaultRoutes(oneshot::Sender<(Option<DefaultRoute>, Option<DefaultRoute>)>),
-    /// Return gateway for V4 and V6
-    #[cfg(target_os = "macos")]
-    GetDefaultGateway(oneshot::Sender<(Option<Gateway>, Option<Gateway>)>),
-    #[cfg(target_os = "linux")]
     CreateRoutingRules(bool, oneshot::Sender<Result<(), PlatformError>>),
-    #[cfg(target_os = "linux")]
     ClearRoutingRules(oneshot::Sender<Result<(), PlatformError>>),
-    #[cfg(target_os = "linux")]
     NewChangeListener(oneshot::Sender<mpsc::UnboundedReceiver<CallbackMessage>>),
-    #[cfg(target_os = "linux")]
     GetMtuForRoute(IpAddr, oneshot::Sender<Result<u16, PlatformError>>),
     /// Attempt to fetch a route for the given destination with an optional firewall mark.
-    #[cfg(target_os = "linux")]
     GetDestinationRoute(
         IpAddr,
         Option<Fwmark>,
         oneshot::Sender<Result<Option<Route>, PlatformError>>,
     ),
 }
 
+/// Commands for the underlying route manager object.
+#[cfg(target_os = "android")]
+#[derive(Debug)]
+pub(crate) enum RouteManagerCommand {
+    AddRoutes(
+        HashSet<RequiredRoute>,
+        oneshot::Sender<Result<(), PlatformError>>,
+    ),
+    ClearRoutes,
+    Shutdown(oneshot::Sender<()>),
+}
+
+/// Commands for the underlying route manager object.
+#[cfg(target_os = "macos")]
+#[derive(Debug)]
+pub(crate) enum RouteManagerCommand {
+    AddRoutes(
+        HashSet<RequiredRoute>,
+        oneshot::Sender<Result<(), PlatformError>>,
+    ),
+    ClearRoutes,
+    Shutdown(oneshot::Sender<()>),
+    RefreshRoutes,
+    NewDefaultRouteListener(oneshot::Sender<mpsc::UnboundedReceiver<DefaultRouteEvent>>),
+    GetDefaultRoutes(oneshot::Sender<(Option<DefaultRoute>, Option<DefaultRoute>)>),
+    /// Return gateway for V4 and V6
+    GetDefaultGateway(oneshot::Sender<(Option<Gateway>, Option<Gateway>)>),
+}
+
 /// Event that is sent when a preferred non-tunnel default route is
 /// added or removed.
 #[cfg(target_os = "macos")]