Rename split modules to split_tunnel

8 files changed, 21 insertions, 21 deletions

diff --git a/mullvad-cli/src/cmds/mod.rs b/mullvad-cli/src/cmds/mod.rs
index e215e3da2d..9cdefd19c5 100644
--- a/mullvad-cli/src/cmds/mod.rs
+++ b/mullvad-cli/src/cmds/mod.rs
@@ -35,9 +35,9 @@ mod reset;
 pub use self::reset::Reset;
 
 #[cfg(target_os = "linux")]
-mod split;
+mod split_tunnel;
 #[cfg(target_os = "linux")]
-pub use self::split::Split;
+pub use self::split_tunnel::SplitTunnel;
 
 mod status;
 pub use self::status::Status;
@@ -63,7 +63,7 @@ pub fn get_commands() -> HashMap<&'static str, Box<dyn Command>> {
         Box::new(Relay),
         Box::new(Reset),
         #[cfg(target_os = "linux")]
-        Box::new(Split),
+        Box::new(SplitTunnel),
         Box::new(Status),
         Box::new(Tunnel),
         Box::new(Version),
diff --git a/mullvad-cli/src/cmds/split.rs b/mullvad-cli/src/cmds/split_tunnel.rs
index a8ff1c4375..95b172eb6b 100644
--- a/mullvad-cli/src/cmds/split.rs
+++ b/mullvad-cli/src/cmds/split_tunnel.rs
@@ -1,9 +1,9 @@
 use crate::{new_rpc_client, Command, Result};
 use clap::value_t_or_exit;
 
-pub struct Split;
+pub struct SplitTunnel;
 
-impl Command for Split {
+impl Command for SplitTunnel {
     fn name(&self) -> &'static str {
         "split-tunnel"
     }
@@ -37,7 +37,7 @@ fn create_pid_subcommand() -> clap::App<'static, 'static> {
         .subcommand(clap::SubCommand::with_name("list"))
 }
 
-impl Split {
+impl SplitTunnel {
     fn handle_pid_cmd(matches: &clap::ArgMatches<'_>) -> Result<()> {
         match matches.subcommand() {
             ("add", Some(matches)) => {
diff --git a/mullvad-daemon/src/lib.rs b/mullvad-daemon/src/lib.rs
index e4cd1383c5..2b202deab9 100644
--- a/mullvad-daemon/src/lib.rs
+++ b/mullvad-daemon/src/lib.rs
@@ -56,7 +56,7 @@ use std::{
     time::Duration,
 };
 #[cfg(target_os = "linux")]
-use talpid_core::split;
+use talpid_core::split_tunnel;
 use talpid_core::{
     mpsc::Sender,
     tunnel_state_machine::{self, TunnelCommand, TunnelParametersGenerator},
@@ -99,7 +99,7 @@ pub enum Error {
 
     #[cfg(target_os = "linux")]
     #[error(display = "Unable to initialize split tunneling")]
-    InitSplitTunneling(#[error(source)] split::Error),
+    InitSplitTunneling(#[error(source)] split_tunnel::Error),
 
     #[error(display = "No wireguard private key available")]
     NoKeyAvailable,
@@ -450,7 +450,7 @@ pub struct Daemon<L: EventListener> {
     target_state: TargetState,
     state: DaemonExecutionState,
     #[cfg(target_os = "linux")]
-    exclude_pids: split::PidManager,
+    exclude_pids: split_tunnel::PidManager,
     rx: Wait<UnboundedReceiver<InternalDaemonEvent>>,
     tx: DaemonEventSender,
     reconnection_loop_tx: Option<mpsc::Sender<()>>,
@@ -595,7 +595,7 @@ where
             target_state: initial_target_state,
             state: DaemonExecutionState::Running,
             #[cfg(target_os = "linux")]
-            exclude_pids: split::PidManager::new().map_err(Error::InitSplitTunneling)?,
+            exclude_pids: split_tunnel::PidManager::new().map_err(Error::InitSplitTunneling)?,
             rx: internal_event_rx.wait(),
             tx: internal_event_tx,
             reconnection_loop_tx: None,
diff --git a/talpid-core/src/firewall/linux.rs b/talpid-core/src/firewall/linux.rs
index 4d0a13b9e8..1a047ec41e 100644
--- a/talpid-core/src/firewall/linux.rs
+++ b/talpid-core/src/firewall/linux.rs
@@ -1,5 +1,5 @@
 use super::{FirewallArguments, FirewallPolicy, FirewallT};
-use crate::{split, tunnel};
+use crate::{split_tunnel, tunnel};
 use ipnetwork::IpNetwork;
 use lazy_static::lazy_static;
 use libc;
@@ -283,8 +283,8 @@ impl<'a> PolicyBatch<'a> {
         for chain in &mangle_chains {
             let mut rule = Rule::new(chain);
             rule.add_expr(&nft_expr!(meta cgroup));
-            rule.add_expr(&nft_expr!(cmp == split::NETCLS_CLASSID));
-            rule.add_expr(&nft_expr!(immediate data split::MARK));
+            rule.add_expr(&nft_expr!(cmp == split_tunnel::NETCLS_CLASSID));
+            rule.add_expr(&nft_expr!(immediate data split_tunnel::MARK));
             rule.add_expr(&nft_expr!(ct mark set));
             rule.add_expr(&nft_expr!(meta mark set));
             self.batch.add(&rule, nftnl::MsgType::Add);
@@ -292,19 +292,19 @@ impl<'a> PolicyBatch<'a> {
 
         let mut rule = Rule::new(&self.in_chain);
         rule.add_expr(&nft_expr!(ct mark));
-        rule.add_expr(&nft_expr!(cmp == split::MARK));
+        rule.add_expr(&nft_expr!(cmp == split_tunnel::MARK));
         add_verdict(&mut rule, &Verdict::Accept);
         self.batch.add(&rule, nftnl::MsgType::Add);
 
         let mut rule = Rule::new(&self.out_chain);
         rule.add_expr(&nft_expr!(meta mark));
-        rule.add_expr(&nft_expr!(cmp == split::MARK));
+        rule.add_expr(&nft_expr!(cmp == split_tunnel::MARK));
         add_verdict(&mut rule, &Verdict::Accept);
         self.batch.add(&rule, nftnl::MsgType::Add);
 
         let mut rule = Rule::new(&self.nat_chain);
         rule.add_expr(&nft_expr!(ct mark));
-        rule.add_expr(&nft_expr!(cmp == split::MARK));
+        rule.add_expr(&nft_expr!(cmp == split_tunnel::MARK));
         rule.add_expr(&nft_expr!(masquerade));
         add_verdict(&mut rule, &Verdict::Accept);
         self.batch.add(&rule, nftnl::MsgType::Add);
diff --git a/talpid-core/src/lib.rs b/talpid-core/src/lib.rs
index f9049dc3f6..5df4f2f0aa 100644
--- a/talpid-core/src/lib.rs
+++ b/talpid-core/src/lib.rs
@@ -21,7 +21,7 @@ pub mod routing;
 mod offline;
 
 /// Split tunneling
-pub mod split;
+pub mod split_tunnel;
 
 /// Working with processes.
 pub mod process;
diff --git a/talpid-core/src/routing/linux.rs b/talpid-core/src/routing/linux.rs
index 04dc47fd46..71becd2a63 100644
--- a/talpid-core/src/routing/linux.rs
+++ b/talpid-core/src/routing/linux.rs
@@ -1,6 +1,6 @@
 use crate::{
     routing::{imp::RouteManagerCommand, NetNode, Node, RequiredRoute, Route},
-    split,
+    split_tunnel,
 };
 
 use talpid_types::ErrorExt;
@@ -310,7 +310,7 @@ impl RouteManagerImplInner {
                 "from",
                 "all",
                 "fwmark",
-                &split::MARK.to_string(),
+                &split_tunnel::MARK.to_string(),
                 "lookup",
                 table_id_str,
             ])?;
@@ -337,7 +337,7 @@ impl RouteManagerImplInner {
             "from",
             "all",
             "fwmark",
-            &split::MARK.to_string(),
+            &split_tunnel::MARK.to_string(),
             "lookup",
             &self.split_table_id.to_string(),
         ]) {
diff --git a/talpid-core/src/split.rs b/talpid-core/src/split_tunnel.rs
index d9054ad4d8..d9054ad4d8 100644
--- a/talpid-core/src/split.rs
+++ b/talpid-core/src/split_tunnel.rs
diff --git a/talpid-core/src/tunnel_state_machine/mod.rs b/talpid-core/src/tunnel_state_machine/mod.rs
index d1225496e1..b0222ade67 100644
--- a/talpid-core/src/tunnel_state_machine/mod.rs
+++ b/talpid-core/src/tunnel_state_machine/mod.rs
@@ -53,7 +53,7 @@ pub enum Error {
     /// Unable to set up split tunneling
     #[cfg(target_os = "linux")]
     #[error(display = "Failed to initialize split tunneling")]
-    InitSplitTunneling(#[error(source)] crate::split::Error),
+    InitSplitTunneling(#[error(source)] crate::split_tunnel::Error),
 
     /// Failed to initialize the system firewall integration.
     #[error(display = "Failed to initialize the system firewall integration")]