workaround for failure to bind tcp/quic listeners
This commit is contained in:
parent
3fc796303a
commit
1c4e450f1d
4 changed files with 51 additions and 6 deletions
|
|
@ -8,6 +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;
|
||||||
|
|
||||||
#[cfg(feature = "h3")]
|
#[cfg(feature = "h3")]
|
||||||
pub const H3_ALT_SVC_MAX_AGE: u32 = 60;
|
pub const H3_ALT_SVC_MAX_AGE: u32 = 60;
|
||||||
#[cfg(feature = "h3")]
|
#[cfg(feature = "h3")]
|
||||||
|
|
|
||||||
|
|
@ -32,10 +32,14 @@ where
|
||||||
client_addr: SocketAddr, // アクセス制御用
|
client_addr: SocketAddr, // アクセス制御用
|
||||||
) -> Result<Response<Body>> {
|
) -> Result<Response<Body>> {
|
||||||
info!(
|
info!(
|
||||||
"Handling {:?} request from {}: {} {} {:?}",
|
"Handling {:?} request from {}: {} {:?} {} {:?}",
|
||||||
req.version(),
|
req.version(),
|
||||||
client_addr,
|
client_addr,
|
||||||
req.method(),
|
req.method(),
|
||||||
|
req
|
||||||
|
.headers()
|
||||||
|
.get("host")
|
||||||
|
.map_or_else(|| "<none>", |h| h.to_str().unwrap()),
|
||||||
req.uri(),
|
req.uri(),
|
||||||
req
|
req
|
||||||
.headers()
|
.headers()
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
// use super::proxy_handler::handle_request;
|
// use super::proxy_handler::handle_request;
|
||||||
use super::Backends;
|
use super::Backends;
|
||||||
use crate::{error::*, globals::Globals, log::*};
|
use crate::{constants::GET_LISTENER_RETRY_TIMEOUT_SEC, 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,
|
||||||
};
|
};
|
||||||
|
|
@ -77,9 +77,27 @@ where
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Work around to forcibly get tcp listener for "address already in use"
|
||||||
|
async fn try_bind_tcp_listener(&self) -> Result<TcpListener> {
|
||||||
|
let fut = async {
|
||||||
|
loop {
|
||||||
|
if let Ok(listener) = TcpListener::bind(&self.listening_on).await {
|
||||||
|
break listener;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
tokio::time::timeout(
|
||||||
|
tokio::time::Duration::from_secs(GET_LISTENER_RETRY_TIMEOUT_SEC),
|
||||||
|
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<()> {
|
||||||
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 HTTP request for configured host names: {:?}",
|
"Start TCP proxy serving with HTTP request for configured host names: {:?}",
|
||||||
tcp_listener.local_addr()?
|
tcp_listener.local_addr()?
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
use super::proxy_main::{LocalExecutor, Proxy};
|
use super::proxy_main::{LocalExecutor, Proxy};
|
||||||
use crate::{constants::CERTS_WATCH_DELAY_SECS, error::*, log::*};
|
use crate::{constants::*, error::*, log::*};
|
||||||
#[cfg(feature = "h3")]
|
#[cfg(feature = "h3")]
|
||||||
use futures::StreamExt;
|
use futures::StreamExt;
|
||||||
use futures::{future::FutureExt, join, select};
|
use futures::{future::FutureExt, join, select};
|
||||||
|
|
@ -99,8 +99,8 @@ where
|
||||||
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));
|
||||||
|
|
||||||
let (endpoint, incoming) =
|
let (endpoint, incoming) = self.try_bind_quic_listener(server_config_h3).await?;
|
||||||
quinn::Endpoint::server(server_config_h3, self.listening_on).unwrap();
|
// quinn::Endpoint::server(server_config_h3, self.listening_on).unwrap();
|
||||||
info!(
|
info!(
|
||||||
"Start UDP proxy serving with HTTP/3 request for configured host names: {:?}",
|
"Start UDP proxy serving with HTTP/3 request for configured host names: {:?}",
|
||||||
endpoint.local_addr()?
|
endpoint.local_addr()?
|
||||||
|
|
@ -181,6 +181,27 @@ where
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Work around to forcibly get quic listener for "address already in use"
|
||||||
|
#[cfg(feature = "h3")]
|
||||||
|
async fn try_bind_quic_listener(
|
||||||
|
&self,
|
||||||
|
server_config: quinn::ServerConfig,
|
||||||
|
) -> Result<(quinn::Endpoint, quinn::Incoming)> {
|
||||||
|
let fut = async {
|
||||||
|
loop {
|
||||||
|
if let Ok(listener) = quinn::Endpoint::server(server_config.clone(), self.listening_on) {
|
||||||
|
break listener;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
tokio::time::timeout(
|
||||||
|
tokio::time::Duration::from_secs(GET_LISTENER_RETRY_TIMEOUT_SEC),
|
||||||
|
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> {
|
||||||
let backend_serve = if let Some(backend_serve) = self.backends.apps.get(server_name) {
|
let backend_serve = if let Some(backend_serve) = self.backends.apps.get(server_name) {
|
||||||
backend_serve
|
backend_serve
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue