workaround for failure to bind tcp/quic listeners, improved?
This commit is contained in:
parent
9d6fdb3e98
commit
c027f4456d
3 changed files with 48 additions and 30 deletions
|
|
@ -8,7 +8,8 @@ pub const MAX_CONCURRENT_STREAMS: u32 = 16;
|
||||||
// #[cfg(feature = "tls")]
|
// #[cfg(feature = "tls")]
|
||||||
pub const CERTS_WATCH_DELAY_SECS: u32 = 10;
|
pub const CERTS_WATCH_DELAY_SECS: u32 = 10;
|
||||||
|
|
||||||
pub const GET_LISTENER_RETRY_TIMEOUT_SEC: u64 = 2;
|
pub const GET_LISTENER_RETRY_MAX_CNT: u64 = 128;
|
||||||
|
pub const GET_LISTENER_RETRY_WAITING_MSEC: u64 = 10;
|
||||||
|
|
||||||
#[cfg(feature = "h3")]
|
#[cfg(feature = "h3")]
|
||||||
pub const H3_ALT_SVC_MAX_AGE: u32 = 60;
|
pub const H3_ALT_SVC_MAX_AGE: u32 = 60;
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
// use super::proxy_handler::handle_request;
|
// use super::proxy_handler::handle_request;
|
||||||
use super::Backends;
|
use super::Backends;
|
||||||
use crate::{constants::GET_LISTENER_RETRY_TIMEOUT_SEC, error::*, globals::Globals, log::*};
|
use crate::{constants::*, error::*, globals::Globals, log::*};
|
||||||
use hyper::{
|
use hyper::{
|
||||||
client::connect::Connect, server::conn::Http, service::service_fn, Body, Client, Request,
|
client::connect::Connect, server::conn::Http, service::service_fn, Body, Client, Request,
|
||||||
};
|
};
|
||||||
|
|
@ -78,20 +78,21 @@ where
|
||||||
}
|
}
|
||||||
|
|
||||||
// Work around to forcibly get tcp listener for "address already in use"
|
// Work around to forcibly get tcp listener for "address already in use"
|
||||||
async fn try_bind_tcp_listener(&self) -> Result<TcpListener> {
|
pub(super) async fn try_bind_tcp_listener(&self) -> Result<TcpListener> {
|
||||||
let fut = async {
|
let mut cnt = 0;
|
||||||
loop {
|
while cnt < GET_LISTENER_RETRY_MAX_CNT {
|
||||||
if let Ok(listener) = TcpListener::bind(&self.listening_on).await {
|
if let Ok(listener) = TcpListener::bind(&self.listening_on).await {
|
||||||
break listener;
|
return Ok(listener);
|
||||||
}
|
}
|
||||||
|
cnt += 1;
|
||||||
|
tokio::time::sleep(tokio::time::Duration::from_millis(
|
||||||
|
GET_LISTENER_RETRY_WAITING_MSEC,
|
||||||
|
))
|
||||||
|
.await;
|
||||||
}
|
}
|
||||||
};
|
|
||||||
tokio::time::timeout(
|
error!("Failed to get tcp listener: {}", self.listening_on);
|
||||||
tokio::time::Duration::from_secs(GET_LISTENER_RETRY_TIMEOUT_SEC),
|
Err(anyhow!("Failed to get tcp listener: {}", self.listening_on))
|
||||||
fut,
|
|
||||||
)
|
|
||||||
.await
|
|
||||||
.map_err(|_e| anyhow!("Failed to get listener"))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn start_without_tls(self, server: Http<LocalExecutor>) -> Result<()> {
|
async fn start_without_tls(self, server: Http<LocalExecutor>) -> Result<()> {
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,6 @@ use futures::{future::FutureExt, join, select};
|
||||||
use hyper::{client::connect::Connect, server::conn::Http};
|
use hyper::{client::connect::Connect, server::conn::Http};
|
||||||
use rustls::ServerConfig;
|
use rustls::ServerConfig;
|
||||||
use std::{sync::Arc, time::Duration};
|
use std::{sync::Arc, time::Duration};
|
||||||
use tokio::net::TcpListener;
|
|
||||||
|
|
||||||
impl<T> Proxy<T>
|
impl<T> Proxy<T>
|
||||||
where
|
where
|
||||||
|
|
@ -29,7 +28,8 @@ where
|
||||||
|
|
||||||
// TCP Listener Service, i.e., http/2 and http/1.1
|
// TCP Listener Service, i.e., http/2 and http/1.1
|
||||||
let listener_service = async {
|
let listener_service = async {
|
||||||
let tcp_listener = TcpListener::bind(&self.listening_on).await?;
|
// let tcp_listener = TcpListener::bind(&self.listening_on).await?;
|
||||||
|
let tcp_listener = self.try_bind_tcp_listener().await?;
|
||||||
info!(
|
info!(
|
||||||
"Start TCP proxy serving with HTTPS request for configured host names: {:?}",
|
"Start TCP proxy serving with HTTPS request for configured host names: {:?}",
|
||||||
tcp_listener.local_addr()?
|
tcp_listener.local_addr()?
|
||||||
|
|
@ -96,6 +96,9 @@ where
|
||||||
initial_app_name
|
initial_app_name
|
||||||
);
|
);
|
||||||
let backend_serve = self.backends.apps.get(initial_app_name).unwrap();
|
let backend_serve = self.backends.apps.get(initial_app_name).unwrap();
|
||||||
|
while backend_serve.get_tls_server_config().is_none() {
|
||||||
|
tokio::time::sleep(tokio::time::Duration::from_millis(10)).await;
|
||||||
|
}
|
||||||
let server_crypto = backend_serve.get_tls_server_config().unwrap();
|
let server_crypto = backend_serve.get_tls_server_config().unwrap();
|
||||||
let server_config_h3 = quinn::ServerConfig::with_crypto(Arc::new(server_crypto));
|
let server_config_h3 = quinn::ServerConfig::with_crypto(Arc::new(server_crypto));
|
||||||
|
|
||||||
|
|
@ -174,7 +177,19 @@ where
|
||||||
#[cfg(feature = "h3")]
|
#[cfg(feature = "h3")]
|
||||||
{
|
{
|
||||||
if self.globals.http3 {
|
if self.globals.http3 {
|
||||||
join!(listener_service, cert_service, listener_service_h3).0
|
tokio::select! {
|
||||||
|
_= cert_service => {
|
||||||
|
error!("Cert service for TLS exited");
|
||||||
|
},
|
||||||
|
_ = listener_service => {
|
||||||
|
error!("TCP proxy service for TLS exited");
|
||||||
|
},
|
||||||
|
_= listener_service_h3 => {
|
||||||
|
error!("UDP proxy service for TLS exited");
|
||||||
|
},
|
||||||
|
};
|
||||||
|
// join!(listener_service, cert_service, listener_service_h3).0
|
||||||
|
Ok(())
|
||||||
} else {
|
} else {
|
||||||
join!(listener_service, cert_service).0
|
join!(listener_service, cert_service).0
|
||||||
}
|
}
|
||||||
|
|
@ -187,19 +202,20 @@ where
|
||||||
&self,
|
&self,
|
||||||
server_config: quinn::ServerConfig,
|
server_config: quinn::ServerConfig,
|
||||||
) -> Result<(quinn::Endpoint, quinn::Incoming)> {
|
) -> Result<(quinn::Endpoint, quinn::Incoming)> {
|
||||||
let fut = async {
|
let mut cnt = 0;
|
||||||
loop {
|
while cnt < GET_LISTENER_RETRY_MAX_CNT {
|
||||||
if let Ok(listener) = quinn::Endpoint::server(server_config.clone(), self.listening_on) {
|
if let Ok(listener) = quinn::Endpoint::server(server_config.clone(), self.listening_on) {
|
||||||
break listener;
|
return Ok(listener);
|
||||||
}
|
}
|
||||||
|
cnt += 1;
|
||||||
|
tokio::time::sleep(tokio::time::Duration::from_millis(
|
||||||
|
GET_LISTENER_RETRY_WAITING_MSEC,
|
||||||
|
))
|
||||||
|
.await;
|
||||||
}
|
}
|
||||||
};
|
|
||||||
tokio::time::timeout(
|
error!("Failed to get quic listener: {}", self.listening_on);
|
||||||
tokio::time::Duration::from_secs(GET_LISTENER_RETRY_TIMEOUT_SEC),
|
Err(anyhow!("Failed to get tcp listener: {}", self.listening_on))
|
||||||
fut,
|
|
||||||
)
|
|
||||||
.await
|
|
||||||
.map_err(|_e| anyhow!("Failed to get listener"))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn fetch_server_crypto(&self, server_name: &str) -> Option<ServerConfig> {
|
fn fetch_server_crypto(&self, server_name: &str) -> Option<ServerConfig> {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue