Fix tunnel setup after having negotiated with an ephemeral peer

Co-authored-by: Joakim Hulthe <joakim.hulthe@mullvad.net>

1 files changed, 5 insertions, 2 deletions

diff --git a/talpid-wireguard/src/boringtun/mod.rs b/talpid-wireguard/src/boringtun/mod.rs
index 413a86dddd..31685d1cbd 100644
--- a/talpid-wireguard/src/boringtun/mod.rs
+++ b/talpid-wireguard/src/boringtun/mod.rs
@@ -513,13 +513,16 @@ impl Tunnel for BoringTun {
         config: Config,
         daita: Option<DaitaSettings>,
     ) -> std::pin::Pin<Box<dyn Future<Output = Result<(), TunnelError>> + Send + 'a>> {
-        dbg!(&config);
         Box::pin(async move {
             self.config = config;
 
             // if we're switching to/from multihop, we'll need to tear down the old device(s)
             // and set them up with the new DeviceTransports
-            let recreate_devices = old_config.is_multihop() != self.config.is_multihop();
+            // TODO: Debug configure_devices. Currently we need to tear down the old devices
+            // after having exchanged tunnel params with the ephemeral peer. Empirically this
+            // is true for both DAITA & PQ.
+            // let recreate_devices = old_config.is_multihop() != self.config.is_multihop();
+            let recreate_devices = true;
 
             if recreate_devices {
                 // TODO: devices should never be None while this BoringTun instance is running.