Fix ping timeouts handling

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changes
 
+## [0.5.5] - 2024-05-01
+
+* Fix ping timeouts handling
+
 ## [0.5.4] - 2024-04-23
 
 * Fix Config::frame_read_rate() method

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ntex-h2"
-version = "0.5.4"
+version = "0.5.5"
 license = "MIT OR Apache-2.0"
 authors = ["Nikolay Kim <[email protected]>"]
 description = "An HTTP/2 client and server"
@@ -21,7 +21,7 @@ unstable = []
 
 [dependencies]
 ntex-net = "1.0"
-ntex-io = "1.0"
+ntex-io = "1.1"
 ntex-http = "0.1.11"
 ntex-bytes = "0.1.24"
 ntex-codec = "0.6.2"
@@ -30,7 +30,7 @@ ntex-util = "1.0.0"
 ntex-rt = "0.4.11"
 
 bitflags = "2"
-fxhash = "0.2.1"
+fxhash = "0.2"
 log = "0.4"
 pin-project-lite = "0.2"
 thiserror = "1"
@@ -44,8 +44,8 @@ rand = "0.8.4"
 # HPACK fixtures
 hex = "0.4.3"
 walkdir = "2.3.2"
-serde = "1.0.0"
-serde_json = "1.0.0"
+serde = "1.0"
+serde_json = "1.0"
 
 ntex = { version = "1.2", features = ["openssl", "tokio"] }
 ntex-tls = { version = "1.1", features = ["openssl"] }

src/connection.rs

@@ -27,6 +27,7 @@ bitflags::bitflags! {
         const SECURE                  = 0b0001_0000;
         const STREAM_REFUSED          = 0b0010_0000;
         const KA_TIMER                = 0b0100_0000;
+        const RECV_PONG               = 0b1000_0000;
     }
 }
 
@@ -666,7 +667,7 @@ impl RecvHalfConnection {
     }
 
     pub(crate) fn recv_pong(&self, _: frame::Ping) {
-        self.0.io.stop_timer();
+        self.set_flags(ConnectionFlags::RECV_PONG);
     }
 
     pub(crate) fn recv_go_away(
@@ -808,6 +809,8 @@ async fn ping(st: Connection, timeout: time::Seconds, io: IoRef) {
 
     let mut counter: u64 = 0;
     let keepalive: time::Millis = time::Millis::from(timeout) + time::Millis(100);
+
+    st.set_flags(ConnectionFlags::RECV_PONG);
     loop {
         if st.is_closed() {
             log::debug!("http client connection is closed, stopping keep-alive task");
@@ -817,9 +820,13 @@ async fn ping(st: Connection, timeout: time::Seconds, io: IoRef) {
         if st.is_closed() {
             break;
         }
+        if !st.0.flags.get().contains(ConnectionFlags::RECV_PONG) {
+            io.notify_timeout();
+            break;
+        }
 
         counter += 1;
-        io.start_timer(timeout);
+        st.unset_flags(ConnectionFlags::RECV_PONG);
         st.encode(frame::Ping::new(counter.to_be_bytes()));
     }
 }