From e13ccfb90a21581185c492732362f08ef30659d3 Mon Sep 17 00:00:00 2001
From: Oleksandr Babak <alexanderbabak@proton.me>
Date: Wed, 26 Feb 2025 16:34:23 +0100
Subject: [PATCH] fix: set default network timeout as
 `config.connection_timeout_ms` instead of zero

---
 rumqttd/src/link/bridge.rs   | 2 ++
 rumqttd/src/link/network.rs  | 3 ++-
 rumqttd/src/server/broker.rs | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/rumqttd/src/link/bridge.rs b/rumqttd/src/link/bridge.rs
index 0c6b193be..7ab231866 100644
--- a/rumqttd/src/link/bridge.rs
+++ b/rumqttd/src/link/bridge.rs
@@ -172,6 +172,7 @@ async fn network_connect<P: Protocol>(
                 config.connections.max_payload_size,
                 config.connections.max_inflight_count,
                 protocol,
+                Duration::from_millis(config.connections.connection_timeout_ms as u64),
             ))
         }
         #[cfg(feature = "use-rustls")]
@@ -185,6 +186,7 @@ async fn network_connect<P: Protocol>(
                 config.connections.max_payload_size,
                 config.connections.max_inflight_count,
                 protocol,
+                Duration::from_millis(config.connections.connection_timeout_ms as u64),
             ))
         }
         #[cfg(not(feature = "use-rustls"))]
diff --git a/rumqttd/src/link/network.rs b/rumqttd/src/link/network.rs
index f37dd76a5..fb63cd1f5 100644
--- a/rumqttd/src/link/network.rs
+++ b/rumqttd/src/link/network.rs
@@ -48,6 +48,7 @@ impl<P: Protocol> Network<P> {
         max_incoming_size: usize,
         max_connection_buffer_len: usize,
         protocol: P,
+        keepalive: Duration,
     ) -> Network<P> {
         Network {
             socket,
@@ -55,7 +56,7 @@ impl<P: Protocol> Network<P> {
             write: BytesMut::with_capacity(10 * 1024),
             max_incoming_size,
             max_connection_buffer_len,
-            keepalive: Duration::ZERO,
+            keepalive,
             protocol,
         }
     }
diff --git a/rumqttd/src/server/broker.rs b/rumqttd/src/server/broker.rs
index 9886541c9..89187a538 100644
--- a/rumqttd/src/server/broker.rs
+++ b/rumqttd/src/server/broker.rs
@@ -502,6 +502,7 @@ async fn remote<P: Protocol>(
         config.max_payload_size,
         config.max_inflight_count,
         protocol,
+        Duration::from_millis(config.connection_timeout_ms as u64),
     );
 
     let dynamic_filters = config.dynamic_filters;