Create talpid-types and put TransportProtocol there

2 files changed, 10 insertions, 13 deletions

diff --git a/mullvad-daemon/Cargo.toml b/mullvad-daemon/Cargo.toml
index 786baac7a3..b355c4bf53 100644
--- a/mullvad-daemon/Cargo.toml
+++ b/mullvad-daemon/Cargo.toml
@@ -32,6 +32,7 @@ toml = "0.4"
 mullvad-types = { path = "../mullvad-types" }
 talpid-core = { path = "../talpid-core" }
 talpid-ipc = { path = "../talpid-ipc" }
+talpid-types = { path = "../talpid-types" }
 
 [target.'cfg(unix)'.dependencies]
 simple-signal = "1.1"
diff --git a/mullvad-daemon/src/main.rs b/mullvad-daemon/src/main.rs
index 17b6df06d5..d548eb3e03 100644
--- a/mullvad-daemon/src/main.rs
+++ b/mullvad-daemon/src/main.rs
@@ -35,6 +35,7 @@ extern crate lazy_static;
 extern crate mullvad_types;
 extern crate talpid_core;
 extern crate talpid_ipc;
+extern crate talpid_types;
 
 mod cli;
 mod management_interface;
@@ -57,14 +58,13 @@ use mullvad_types::states::{DaemonState, SecurityState, TargetState};
 use std::io;
 use std::net::{Ipv4Addr, SocketAddr, ToSocketAddrs};
 use std::path::PathBuf;
-use std::str::FromStr;
 use std::sync::{Arc, Mutex, mpsc};
 use std::thread;
 
 use talpid_core::firewall::{Firewall, FirewallProxy, SecurityPolicy};
 use talpid_core::mpsc::IntoSender;
-use talpid_core::net::{Endpoint, TransportProtocol};
 use talpid_core::tunnel::{self, TunnelEvent, TunnelMonitor};
+use talpid_types::net::{Endpoint, TransportProtocol};
 
 error_chain!{
     errors {
@@ -544,17 +544,13 @@ impl Daemon {
                 )
             }
 
-            let protocol = TransportProtocol::from_str(&relay_endpoint.protocol)
-                .map_err(
-                    |_| {
-                        format!(
-                            "Invalid custom server protocol: {}",
-                            relay_endpoint.protocol
-                        )
-                    },
-                )?;
-
-            Ok(Endpoint::new(socket_addr.ip(), socket_addr.port(), protocol),)
+            Ok(
+                Endpoint::new(
+                    socket_addr.ip(),
+                    socket_addr.port(),
+                    relay_endpoint.protocol,
+                ),
+            )
         }
     }