diff options
author | Alex Auvolat <alex@adnab.me> | 2024-02-19 11:24:33 +0100 |
---|---|---|
committer | Alex Auvolat <alex@adnab.me> | 2024-02-19 11:45:44 +0100 |
commit | b96f84b894684ed43e281a3aa2f391b424414a84 (patch) | |
tree | a55cb8b6f3306acbd3bd1a90add88e33405680fc /src/net | |
parent | f0bbad2db95b00ec429f498fe15f1007bd87da5e (diff) | |
download | garage-b96f84b894684ed43e281a3aa2f391b424414a84.tar.gz garage-b96f84b894684ed43e281a3aa2f391b424414a84.zip |
[networking-fixes] add option to bind outgoing RPC sockets (fix #638)
Thanks to yuka for the original patch.
Diffstat (limited to 'src/net')
-rw-r--r-- | src/net/netapp.rs | 26 | ||||
-rw-r--r-- | src/net/test.rs | 2 |
2 files changed, 23 insertions, 5 deletions
diff --git a/src/net/netapp.rs b/src/net/netapp.rs index e572dc11..faa51a99 100644 --- a/src/net/netapp.rs +++ b/src/net/netapp.rs @@ -13,7 +13,7 @@ use sodiumoxide::crypto::sign::ed25519; use futures::stream::futures_unordered::FuturesUnordered; use futures::stream::StreamExt; -use tokio::net::{TcpListener, TcpStream}; +use tokio::net::{TcpListener, TcpSocket, TcpStream}; use tokio::select; use tokio::sync::{mpsc, watch}; @@ -62,6 +62,7 @@ type OnDisconnectHandler = Box<dyn Fn(NodeID, bool) + Send + Sync>; /// If using it alone, you will want to set `on_connect` and `on_disconnect` events /// in order to manage information about the current peer list. pub struct NetApp { + bind_outgoing_to: Option<IpAddr>, listen_params: ArcSwapOption<ListenParams>, /// Version tag, 8 bytes for netapp version, 8 bytes for app version @@ -94,13 +95,19 @@ impl NetApp { /// using `.listen()` /// /// Our Peer ID is the public key associated to the secret key given here. - pub fn new(app_version_tag: u64, netid: auth::Key, privkey: ed25519::SecretKey) -> Arc<Self> { + pub fn new( + app_version_tag: u64, + netid: auth::Key, + privkey: ed25519::SecretKey, + bind_outgoing_to: Option<IpAddr>, + ) -> Arc<Self> { let mut version_tag = [0u8; 16]; version_tag[0..8].copy_from_slice(&u64::to_be_bytes(NETAPP_VERSION_TAG)[..]); version_tag[8..16].copy_from_slice(&u64::to_be_bytes(app_version_tag)[..]); let id = privkey.public_key(); let netapp = Arc::new(Self { + bind_outgoing_to, listen_params: ArcSwapOption::new(None), version_tag, netid, @@ -300,9 +307,20 @@ impl NetApp { return Ok(()); } - let socket = TcpStream::connect(ip).await?; + let stream = match self.bind_outgoing_to { + Some(addr) => { + let socket = if addr.is_ipv4() { + TcpSocket::new_v4()? + } else { + TcpSocket::new_v6()? + }; + socket.bind(SocketAddr::new(addr, 0))?; + socket.connect(ip).await? + } + None => TcpStream::connect(ip).await?, + }; info!("Connected to {}, negotiating handshake...", ip); - ClientConn::init(self, socket, id).await?; + ClientConn::init(self, stream, id).await?; Ok(()) } diff --git a/src/net/test.rs b/src/net/test.rs index c6259752..5a3f236d 100644 --- a/src/net/test.rs +++ b/src/net/test.rs @@ -102,7 +102,7 @@ fn run_netapp( Arc<NetApp>, Arc<PeeringManager>, ) { - let netapp = NetApp::new(0u64, netid, sk); + let netapp = NetApp::new(0u64, netid, sk, None); let peering = PeeringManager::new(netapp.clone(), bootstrap_peers, None); let peering2 = peering.clone(); |