Replace address file with socket path in mullvad-paths

2 files changed, 8 insertions, 20 deletions

diff --git a/mullvad-paths/src/lib.rs b/mullvad-paths/src/lib.rs
index a2f5478d31..d05923c03a 100644
--- a/mullvad-paths/src/lib.rs
+++ b/mullvad-paths/src/lib.rs
@@ -52,7 +52,7 @@ pub mod resources;
 pub use resources::get_resource_dir;
 
 mod rpc_address;
-pub use rpc_address::get_rpc_address_path;
+pub use rpc_address::get_rpc_socket_path;
 
 mod settings;
 pub use settings::settings_dir;
diff --git a/mullvad-paths/src/rpc_address.rs b/mullvad-paths/src/rpc_address.rs
index a97b3e0c36..f71e7a4edd 100644
--- a/mullvad-paths/src/rpc_address.rs
+++ b/mullvad-paths/src/rpc_address.rs
@@ -1,24 +1,12 @@
-use Result;
-
 use std::env;
 use std::path::PathBuf;
 
-const RPC_ADDRESS_FILENAME: &str = ".mullvad_rpc_address";
-
-pub fn get_rpc_address_path() -> Result<PathBuf> {
-    match env::var_os("MULLVAD_RPC_ADDRESS_PATH") {
-        Some(path) => Ok(PathBuf::from(path)),
-        None => get_default_rpc_address_dir().map(|dir| dir.join(RPC_ADDRESS_FILENAME)),
-    }
-}
-
-fn get_default_rpc_address_dir() -> Result<PathBuf> {
-    #[cfg(unix)]
-    {
-        Ok(PathBuf::from("/tmp"))
-    }
-    #[cfg(windows)]
-    {
-        ::get_allusersprofile_dir().map(|dir| dir.join(::PRODUCT_NAME))
+pub fn get_rpc_socket_path() -> PathBuf {
+    match env::var_os("MULLVAD_RPC_SOCKET_PATH") {
+        Some(path) => PathBuf::from(path),
+        #[cfg(unix)]
+        None => PathBuf::from("/var/run/mullvad-vpn"),
+        #[cfg(windows)]
+        None => PathBuf::from("//./pipe/Mullvad VPN"),
     }
 }