Apply changes from PR

2 files changed, 9 insertions, 4 deletions

diff --git a/mullvad-ios/src/tunnel_obfuscator_proxy/mod.rs b/mullvad-ios/src/tunnel_obfuscator_proxy/mod.rs
index 86c8b0540c..bb208db57e 100644
--- a/mullvad-ios/src/tunnel_obfuscator_proxy/mod.rs
+++ b/mullvad-ios/src/tunnel_obfuscator_proxy/mod.rs
@@ -32,8 +32,8 @@ impl TunnelObfuscatorRuntime {
                 ObfuscationSettings::Quic(quic::Settings {
                     quic_endpoint: peer,
                     wireguard_endpoint: SocketAddr::from((Ipv4Addr::LOCALHOST, 51820)),
-                    // TODO
-                    hostname: "se-got-wg-881.relays.stagemole.eu".to_string(),
+                    // TODO: fetch the real hostname from the relay list
+                    hostname: "www.mullvad.net".to_string(),
                 })
             }
         };
diff --git a/tunnel-obfuscation/src/quic.rs b/tunnel-obfuscation/src/quic.rs
index 758e65af44..11a315554d 100644
--- a/tunnel-obfuscation/src/quic.rs
+++ b/tunnel-obfuscation/src/quic.rs
@@ -2,7 +2,10 @@
 
 use async_trait::async_trait;
 use mullvad_masque_proxy::client::{Client, ClientConfig};
-use std::net::{Ipv4Addr, SocketAddr};
+use std::{
+    io,
+    net::{Ipv4Addr, SocketAddr},
+};
 use tokio::net::UdpSocket;
 
 use crate::Obfuscator;
@@ -11,6 +14,8 @@ type Result<T> = std::result::Result<T, Error>;
 
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
+    #[error("Failed to bind UDP socket")]
+    BindError(#[source] io::Error),
     #[error("Masque proxy error")]
     MasqueProxyError(#[source] mullvad_masque_proxy::client::Error),
 }
@@ -34,7 +39,7 @@ impl Quic {
     pub(crate) async fn new(settings: &Settings) -> Result<Self> {
         let local_socket = UdpSocket::bind(SocketAddr::from((Ipv4Addr::LOCALHOST, 0)))
             .await
-            .expect("Failed to bind address");
+            .map_err(Error::BindError)?;
 
         let local_endpoint = local_socket.local_addr().unwrap();