Merge pull request #31 from silicon-heaven/fix-tunneling

syyyr · web-flow · commit ddb3eb8bb9cb · 2026-01-07T11:34:12.000+01:00
Fix inverse contidion in open tunnel retain check
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,7 +3,7 @@ name = "shvcall"
 description = "CLI utility to invoke remote SHV RPC calls"
 license = "MIT"
 repository = "https://github.com/silicon-heaven/shvcall-rs"
-version = "3.9.11"
+version = "3.9.12"
 edition = "2024"
 
 [[bin]]
diff --git a/src/lib.rs b/src/lib.rs
@@ -671,15 +671,9 @@ async fn start_tunnel_server(
                                 break;
                             }
                         }
-                        tunnels.retain(|tunnel| tunnel.frame_sender.is_closed());
-                        // {
-                        //     if tunnel.frame_sender.is_closed() {
-                        //         debug!(target: "Tunnel", "Removing closed tunnel state {:?}", tunnel);
-                        //         false
-                        //     } else {
-                        //         true
-                        //     }
-                        // });
+                        tunnels.extract_if(.., |tunnel| tunnel.frame_sender.is_closed()).for_each(|tunnel| {
+                            debug!(target: "Tunnel", "Removing closed tunnel {:?}", tunnel);
+                        });
                     }
                     Err(e) => {
                         error!("Get response receiver error: {e}");

Original file line number	Diff line number	Diff line change
`@@ -671,15 +671,9 @@ async fn start_tunnel_server(`
`671`	`671`	`break;`
`672`	`672`	`}`
`673`	`673`	`}`
`674`		`- tunnels.retain(\|tunnel\| tunnel.frame_sender.is_closed());`
`675`		`- // {`
`676`		`- // if tunnel.frame_sender.is_closed() {`
`677`		`- // debug!(target: "Tunnel", "Removing closed tunnel state {:?}", tunnel);`
`678`		`- // false`
`679`		`- // } else {`
`680`		`- // true`
`681`		`- // }`
`682`		`- // });`
	`674`	`+ tunnels.extract_if(.., \|tunnel\| tunnel.frame_sender.is_closed()).for_each(\|tunnel\| {`
	`675`	`+ debug!(target: "Tunnel", "Removing closed tunnel {:?}", tunnel);`
	`676`	`+ });`
`683`	`677`	`}`
`684`	`678`	`Err(e) => {`
`685`	`679`	`error!("Get response receiver error: {e}");`