tuxmain/rust-rpxy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add unstable build for testing

Browse source
This commit is contained in:
Jun Kurihara 2023-12-15 16:50:49 +09:00
commit 78a5487293
No known key found for this signature in database
GPG key ID: 48ADFD173ED22B03
4 changed files with 36 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
rpxy-lib/src/proxy/proxy_h3.rs
View file

@ -1,5 +1,6 @@
use super::proxy_main::Proxy;
use crate::{
constants::CONNECTION_TIMEOUT_SEC,
crypto::CryptoSource,
error::*,
hyper_ext::body::{IncomingLike, RequestBody},
@ -10,7 +11,7 @@ use bytes::{Buf, Bytes};
use http::{Request, Response};
use http_body_util::BodyExt;
use hyper_util::client::legacy::connect::Connect;
use std::net::SocketAddr;
use std::{net::SocketAddr, time::Duration};
#[cfg(feature = "http3-quinn")]
use h3::{quic::BidiStream, quic::Connection as ConnectionQuic, server::RequestStream};
@ -70,9 +71,11 @@ where
let self_inner = self.clone();
let tls_server_name_inner = tls_server_name.clone();
self.globals.runtime_handle.spawn(async move {
if let Err(e) = self_inner
.h3_serve_stream(req, stream, client_addr, tls_server_name_inner)
.await
if let Err(e) = tokio::time::timeout(
Duration::from_secs(CONNECTION_TIMEOUT_SEC + 1), // just in case...
self_inner.h3_serve_stream(req, stream, client_addr, tls_server_name_inner),
)
.await
{
warn!("HTTP/3 error on serve stream: {}", e);
}

15
rpxy-lib/src/proxy/proxy_main.rs
View file

@ -1,6 +1,6 @@
use super::socket::bind_tcp_socket;
use crate::{
constants::TLS_HANDSHAKE_TIMEOUT_SEC,
constants::{CONNECTION_TIMEOUT_SEC, TLS_HANDSHAKE_TIMEOUT_SEC},
crypto::{CryptoSource, ServerCrypto, SniServerCryptoMap},
error::*,
globals::Globals,
@ -88,9 +88,11 @@ where
let message_handler_clone = self.message_handler.clone();
let tls_enabled = self.tls_enabled;
let listening_on = self.listening_on;
let timeout_sec = Duration::from_secs(CONNECTION_TIMEOUT_SEC + 1); // just in case...
self.globals.runtime_handle.clone().spawn(async move {
server_clone
.serve_connection_with_upgrades(
timeout(
timeout_sec + Duration::from_secs(1), // just in case...
server_clone.serve_connection_with_upgrades(
stream,
service_fn(move |req: Request<Incoming>| {
serve_request(
@ -102,9 +104,10 @@ where
tls_server_name.clone(),
)
}),
)
.await
.ok();
),
)
.await
.ok();
request_count.decrement();
debug!("Request processed: current # {}", request_count.current());