[pbs-devel] [PATCH proxmox-backup 6/6] adapt examples to hyper/http 1.0

From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 6/6] adapt examples to hyper/http 1.0
Date: Wed, 26 Mar 2025 16:23:27 +0100	[thread overview]
Message-ID: <20250326152327.332179-24-f.gruenbichler@proxmox.com> (raw)
In-Reply-To: <20250326152327.332179-1-f.gruenbichler@proxmox.com>

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
 examples/h2s-server.rs | 28 +++++++++-------------------
 examples/h2server.rs   | 28 ++++++++--------------------
 2 files changed, 17 insertions(+), 39 deletions(-)

diff --git a/examples/h2s-server.rs b/examples/h2s-server.rs
index 0f4c0c145..2f15b0127 100644
--- a/examples/h2s-server.rs
+++ b/examples/h2s-server.rs
@@ -1,26 +1,16 @@
 use std::sync::Arc;
 
 use anyhow::{format_err, Error};
-use futures::*;
-use hyper::{Body, Request, Response};
+use bytes::Bytes;
+use futures::{future, FutureExt, TryFutureExt};
+use http_body_util::Full;
+use hyper::{body::Incoming, Request, Response};
+use hyper_util::rt::{TokioExecutor, TokioIo};
 use openssl::ssl::{SslAcceptor, SslFiletype, SslMethod};
 use tokio::net::{TcpListener, TcpStream};
 
 use pbs_buildcfg::configdir;
 
-#[derive(Clone, Copy)]
-struct H2SExecutor;
-
-impl<Fut> hyper::rt::Executor<Fut> for H2SExecutor
-where
-    Fut: Future + Send + 'static,
-    Fut::Output: Send,
-{
-    fn execute(&self, fut: Fut) {
-        tokio::spawn(fut);
-    }
-}
-
 fn main() -> Result<(), Error> {
     proxmox_async::runtime::main(run())
 }
@@ -63,16 +53,16 @@ async fn handle_connection(socket: TcpStream, acceptor: Arc<SslAcceptor>) -> Res
 
     stream.as_mut().accept().await?;
 
-    let mut http = hyper::server::conn::http2::Builder::new(H2SExecutor);
+    let mut http = hyper::server::conn::http2::Builder::new(TokioExecutor::new());
     // increase window size: todo - find optiomal size
     let max_window_size = (1 << 31) - 2;
     http.initial_stream_window_size(max_window_size);
     http.initial_connection_window_size(max_window_size);
 
-    let service = hyper::service::service_fn(|_req: Request<Body>| {
+    let service = hyper::service::service_fn(|_req: Request<Incoming>| {
         println!("Got request");
         let buffer = vec![65u8; 4 * 1024 * 1024]; // nonsense [A,A,A,A...]
-        let body = Body::from(buffer);
+        let body = Full::<Bytes>::from(buffer);
 
         let response = Response::builder()
             .status(hyper::http::StatusCode::OK)
@@ -85,7 +75,7 @@ async fn handle_connection(socket: TcpStream, acceptor: Arc<SslAcceptor>) -> Res
         future::ok::<_, Error>(response)
     });
 
-    http.serve_connection(stream, service)
+    http.serve_connection(TokioIo::new(stream), service)
         .map_err(Error::from)
         .await?;
 
diff --git a/examples/h2server.rs b/examples/h2server.rs
index 6b286e787..2c368810d 100644
--- a/examples/h2server.rs
+++ b/examples/h2server.rs
@@ -1,24 +1,12 @@
-use std::future::Future;
-
 use anyhow::Error;
+use bytes::Bytes;
 use futures::*;
-use hyper::{Body, Request, Response};
+use http_body_util::Full;
+use hyper::{body::Incoming, Request, Response};
 
+use hyper_util::rt::{TokioExecutor, TokioIo};
 use tokio::net::{TcpListener, TcpStream};
 
-#[derive(Clone, Copy)]
-struct H2Executor;
-
-impl<Fut> hyper::rt::Executor<Fut> for H2Executor
-where
-    Fut: Future + Send + 'static,
-    Fut::Output: Send,
-{
-    fn execute(&self, fut: Fut) {
-        tokio::spawn(fut);
-    }
-}
-
 fn main() -> Result<(), Error> {
     proxmox_async::runtime::main(run())
 }
@@ -41,16 +29,16 @@ async fn run() -> Result<(), Error> {
 async fn handle_connection(socket: TcpStream) -> Result<(), Error> {
     socket.set_nodelay(true).unwrap();
 
-    let mut http = hyper::server::conn::http2::Builder::new(H2Executor);
+    let mut http = hyper::server::conn::http2::Builder::new(TokioExecutor::new());
     // increase window size: todo - find optiomal size
     let max_window_size = (1 << 31) - 2;
     http.initial_stream_window_size(max_window_size);
     http.initial_connection_window_size(max_window_size);
 
-    let service = hyper::service::service_fn(|_req: Request<Body>| {
+    let service = hyper::service::service_fn(|_req: Request<Incoming>| {
         println!("Got request");
         let buffer = vec![65u8; 4 * 1024 * 1024]; // nonsense [A,A,A,A...]
-        let body = Body::from(buffer);
+        let body = Full::<Bytes>::from(buffer);
 
         let response = Response::builder()
             .status(hyper::http::StatusCode::OK)
@@ -63,7 +51,7 @@ async fn handle_connection(socket: TcpStream) -> Result<(), Error> {
         future::ok::<_, Error>(response)
     });
 
-    http.serve_connection(socket, service)
+    http.serve_connection(TokioIo::new(socket), service)
         .map_err(Error::from)
         .await?;
 
-- 
2.39.5



_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
