fixup! Add domain fronting server

Author: pinkisemils

mullvad-api/src/proxy.rs

@@ -74,25 +74,22 @@ pub enum ProxyConfig {
 
 impl ProxyConfig {
     /// Returns the remote endpoint describing how to reach the proxy.
-    fn get_endpoint(&self) -> Option<Endpoint> {
+    fn get_endpoint(&self) -> Endpoint {
         match self {
-            ProxyConfig::Shadowsocks(shadowsocks) => Some(Endpoint::from_socket_address(
-                shadowsocks.endpoint,
-                TransportProtocol::Tcp,
-            )),
-            ProxyConfig::Socks5Local(local) => Some(local.remote_endpoint),
-            ProxyConfig::Socks5Remote(remote) => Some(Endpoint::from_socket_address(
-                remote.endpoint,
-                TransportProtocol::Tcp,
-            )),
+            ProxyConfig::Shadowsocks(shadowsocks) => {
+                Endpoint::from_socket_address(shadowsocks.endpoint, TransportProtocol::Tcp)
+            }
+            ProxyConfig::Socks5Local(local) => local.remote_endpoint,
+            ProxyConfig::Socks5Remote(remote) => {
+                Endpoint::from_socket_address(remote.endpoint, TransportProtocol::Tcp)
+            }
             ProxyConfig::EncryptedDnsProxy(proxy) => {
                 let addr = SocketAddr::V4(proxy.addr);
-                Some(Endpoint::from_socket_address(addr, TransportProtocol::Tcp))
+                Endpoint::from_socket_address(addr, TransportProtocol::Tcp)
+            }
+            ProxyConfig::DomainFronting(proxy) => {
+                Endpoint::from_socket_address(proxy.addr, TransportProtocol::Tcp)
             }
-            ProxyConfig::DomainFronting(proxy) => Some(Endpoint::from_socket_address(
-                proxy.addr,
-                TransportProtocol::Tcp,
-            )),
         }
     }
 }
@@ -178,7 +175,7 @@ impl ApiConnectionMode {
     pub fn get_endpoint(&self) -> Option<Endpoint> {
         match self {
             ApiConnectionMode::Direct => None,
-            ApiConnectionMode::Proxied(proxy_config) => proxy_config.get_endpoint(),
+            ApiConnectionMode::Proxied(proxy_config) => Some(proxy_config.get_endpoint()),
         }
     }