From d88bfc48cfd809a68ab2df07eb158128ba9f2c51 Mon Sep 17 00:00:00 2001 From: zephyr Date: Wed, 4 May 2022 00:48:04 +0900 Subject: [PATCH] realm_core: add builtin multi-remote support, at the cost of wasting 16b mem per endpoint --- realm_core/Cargo.toml | 5 ++--- realm_core/src/endpoint.rs | 18 ++++-------------- realm_core/src/tcp/middle.rs | 3 +-- realm_core/src/tcp/mod.rs | 14 +------------- realm_core/tests/proxy_v1.rs | 3 +++ realm_core/tests/proxy_v2.rs | 3 +++ realm_core/tests/tcp.rs | 1 + realm_core/tests/udp.rs | 1 + 8 files changed, 16 insertions(+), 32 deletions(-) diff --git a/realm_core/Cargo.toml b/realm_core/Cargo.toml index c783170..025ae15 100644 --- a/realm_core/Cargo.toml +++ b/realm_core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "realm_core" -version = "0.2.1" +version = "0.2.2" authors = ["Realm Contributors"] description = "Realm's core facilities." repository = "https://github.com/zhboner/realm/realm_core" @@ -30,8 +30,7 @@ proxy-protocol = { version = "0.5", optional = true } [features] default = [] x = [] -multi-remote = [] -hook = ["realm_hook", "multi-remote"] +hook = ["realm_hook"] transport = ["kaminari"] transport-boost = [] proxy = ["proxy-protocol", "bytes", "tokio/io-util"] diff --git a/realm_core/src/endpoint.rs b/realm_core/src/endpoint.rs index bec60b2..44bd1ee 100644 --- a/realm_core/src/endpoint.rs +++ b/realm_core/src/endpoint.rs @@ -52,8 +52,6 @@ pub struct Endpoint { pub laddr: SocketAddr, pub raddr: RemoteAddr, pub conn_opts: ConnectOpts, - - #[cfg(feature = "multi-remote")] pub extra_raddrs: Vec, } @@ -71,19 +69,11 @@ impl Display for RemoteAddr { impl Display for Endpoint { fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { - #[cfg(not(feature = "multi-remote"))] - write!(f, "{} -> {}; options: {}", &self.laddr, &self.raddr, &self.conn_opts)?; - - #[cfg(feature = "multi-remote")] - { - write!(f, "{} -> [{}", &self.laddr, &self.raddr)?; - for raddr in self.extra_raddrs.iter() { - write!(f, "|{}", raddr)?; - } - write!(f, "]; options: {}", &self.conn_opts)?; + write!(f, "{} -> [{}", &self.laddr, &self.raddr)?; + for raddr in self.extra_raddrs.iter() { + write!(f, "|{}", raddr)?; } - - Ok(()) + write!(f, "]; options: {}", &self.conn_opts) } } diff --git a/realm_core/src/tcp/middle.rs b/realm_core/src/tcp/middle.rs index 2b7118f..e54a90e 100644 --- a/realm_core/src/tcp/middle.rs +++ b/realm_core/src/tcp/middle.rs @@ -22,8 +22,7 @@ pub async fn connect_and_relay( mut local: TcpStream, raddr: Ref, conn_opts: Ref, - - #[cfg(feature = "multi-remote")] extra_raddrs: Ref>, + extra_raddrs: Ref>, ) -> Result<()> { let ConnectOpts { #[cfg(feature = "proxy-protocol")] diff --git a/realm_core/src/tcp/mod.rs b/realm_core/src/tcp/mod.rs index 4fa576c..b6c7622 100644 --- a/realm_core/src/tcp/mod.rs +++ b/realm_core/src/tcp/mod.rs @@ -26,15 +26,11 @@ pub async fn run_tcp(endpoint: Endpoint) -> Result<()> { laddr, raddr, conn_opts, - - #[cfg(feature = "multi-remote")] extra_raddrs, } = endpoint; let raddr = Ref::new(&raddr); let conn_opts = Ref::new(&conn_opts); - - #[cfg(feature = "multi-remote")] let extra_raddrs = Ref::new(&extra_raddrs); let lis = socket::bind(&laddr).unwrap_or_else(|e| panic!("[tcp]failed to bind {}: {}", &laddr, e)); @@ -52,15 +48,7 @@ pub async fn run_tcp(endpoint: Endpoint) -> Result<()> { let _ = local.set_nodelay(true); tokio::spawn(async move { - match connect_and_relay( - local, - raddr, - conn_opts, - #[cfg(feature = "multi-remote")] - extra_raddrs, - ) - .await - { + match connect_and_relay(local, raddr, conn_opts, extra_raddrs).await { Ok(..) => log::debug!("[tcp]{} => {}, finish", addr, raddr.as_ref()), Err(e) => log::error!("[tcp]{} => {}, error: {}", addr, raddr.as_ref(), e), } diff --git a/realm_core/tests/proxy_v1.rs b/realm_core/tests/proxy_v1.rs index 00ef6d5..31b3204 100644 --- a/realm_core/tests/proxy_v1.rs +++ b/realm_core/tests/proxy_v1.rs @@ -9,6 +9,7 @@ use realm_core::tcp::run_tcp; use realm_core::endpoint::{Endpoint, RemoteAddr, ConnectOpts, ProxyOpts}; #[tokio::test] +#[cfg(feature = "proxy")] async fn proxy_v1() { env_logger::init(); @@ -26,6 +27,7 @@ async fn proxy_v1() { }, ..Default::default() }, + extra_raddrs: Vec::new(), }; let endpoint2 = Endpoint { @@ -42,6 +44,7 @@ async fn proxy_v1() { }, ..Default::default() }, + extra_raddrs: Vec::new(), }; tokio::spawn(run_tcp(endpoint1)); diff --git a/realm_core/tests/proxy_v2.rs b/realm_core/tests/proxy_v2.rs index c51854d..97419ed 100644 --- a/realm_core/tests/proxy_v2.rs +++ b/realm_core/tests/proxy_v2.rs @@ -9,6 +9,7 @@ use realm_core::tcp::run_tcp; use realm_core::endpoint::{Endpoint, RemoteAddr, ConnectOpts, ProxyOpts}; #[tokio::test] +#[cfg(feature = "proxy")] async fn proxy_v2() { env_logger::init(); @@ -26,6 +27,7 @@ async fn proxy_v2() { }, ..Default::default() }, + extra_raddrs: Vec::new(), }; let endpoint2 = Endpoint { @@ -42,6 +44,7 @@ async fn proxy_v2() { }, ..Default::default() }, + extra_raddrs: Vec::new(), }; tokio::spawn(run_tcp(endpoint1)); diff --git a/realm_core/tests/tcp.rs b/realm_core/tests/tcp.rs index 40a966d..e7f24f7 100644 --- a/realm_core/tests/tcp.rs +++ b/realm_core/tests/tcp.rs @@ -18,6 +18,7 @@ async fn tcp() { .map(RemoteAddr::SocketAddr) .unwrap(), conn_opts: Default::default(), + extra_raddrs: Vec::new(), }; tokio::spawn(run_tcp(endpoint)); diff --git a/realm_core/tests/udp.rs b/realm_core/tests/udp.rs index bd4c2f8..7457859 100644 --- a/realm_core/tests/udp.rs +++ b/realm_core/tests/udp.rs @@ -17,6 +17,7 @@ async fn udp() { .map(RemoteAddr::SocketAddr) .unwrap(), conn_opts: Default::default(), + extra_raddrs: Vec::new(), }; tokio::spawn(run_udp(endpoint));