-
Notifications
You must be signed in to change notification settings - Fork 177
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add TCP buffer sizes configuration (#1629)
* Move socket to stream/listener functions to zenoh-link-commons * Use TcpSocketUtils to create listener/stream in TLS link * Change TcpSocketUtils to TcpSocketConfig * Add TCP buffer size endpoint parameters and parsing * Add TCP buffer sizes to config file * Rename endpoint parameters to match config file * Correct typo * Fix more typos * Remove unused cargo dependency * Add TCP buffer sizes config tests * Allow zero-buffer tests to panic only on mac * Remove test headers from function
- Loading branch information
Showing
13 changed files
with
412 additions
and
112 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| // | ||
| // Copyright (c) 2024 ZettaScale Technology | ||
| // | ||
| // This program and the accompanying materials are made available under the | ||
| // terms of the Eclipse Public License 2.0 which is available at | ||
| // http://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 | ||
| // which is available at https://www.apache.org/licenses/LICENSE-2.0. | ||
| // | ||
| // SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 | ||
| // | ||
| // Contributors: | ||
| // ZettaScale Zenoh Team, <[email protected]> | ||
| // | ||
| use std::net::SocketAddr; | ||
|
|
||
| use tokio::net::{TcpListener, TcpSocket, TcpStream}; | ||
| use zenoh_result::{zerror, ZResult}; | ||
|
|
||
| pub struct TcpSocketConfig<'a> { | ||
| tx_buffer_size: Option<u32>, | ||
| rx_buffer_size: Option<u32>, | ||
| iface: Option<&'a str>, | ||
| } | ||
|
|
||
| impl<'a> TcpSocketConfig<'a> { | ||
| pub fn new( | ||
| tx_buffer_size: Option<u32>, | ||
| rx_buffer_size: Option<u32>, | ||
| iface: Option<&'a str>, | ||
| ) -> Self { | ||
| Self { | ||
| tx_buffer_size, | ||
| rx_buffer_size, | ||
| iface, | ||
| } | ||
| } | ||
|
|
||
| /// Build a new TCPListener bound to `addr` with the given configuration parameters | ||
| pub fn new_listener(&self, addr: &SocketAddr) -> ZResult<(TcpListener, SocketAddr)> { | ||
| let socket = self.socket_with_config(addr)?; | ||
| // Build a TcpListener from TcpSocket | ||
| // https://docs.rs/tokio/latest/tokio/net/struct.TcpSocket.html | ||
| socket.set_reuseaddr(true)?; | ||
| socket.bind(*addr).map_err(|e| zerror!("{}: {}", addr, e))?; | ||
| // backlog (the maximum number of pending connections are queued): 1024 | ||
| let listener = socket | ||
| .listen(1024) | ||
| .map_err(|e| zerror!("{}: {}", addr, e))?; | ||
|
|
||
| let local_addr = listener | ||
| .local_addr() | ||
| .map_err(|e| zerror!("{}: {}", addr, e))?; | ||
|
|
||
| Ok((listener, local_addr)) | ||
| } | ||
|
|
||
| /// Connect to a TCP socket address at `dst_addr` with the given configuration parameters | ||
| pub async fn new_link( | ||
| &self, | ||
| dst_addr: &SocketAddr, | ||
| ) -> ZResult<(TcpStream, SocketAddr, SocketAddr)> { | ||
| let socket = self.socket_with_config(dst_addr)?; | ||
| // Build a TcpStream from TcpSocket | ||
| // https://docs.rs/tokio/latest/tokio/net/struct.TcpSocket.html | ||
| let stream = socket | ||
| .connect(*dst_addr) | ||
| .await | ||
| .map_err(|e| zerror!("{}: {}", dst_addr, e))?; | ||
|
|
||
| let src_addr = stream | ||
| .local_addr() | ||
| .map_err(|e| zerror!("{}: {}", dst_addr, e))?; | ||
|
|
||
| let dst_addr = stream | ||
| .peer_addr() | ||
| .map_err(|e| zerror!("{}: {}", dst_addr, e))?; | ||
|
|
||
| Ok((stream, src_addr, dst_addr)) | ||
| } | ||
|
|
||
| /// Creates a TcpSocket with the provided config | ||
| fn socket_with_config(&self, addr: &SocketAddr) -> ZResult<TcpSocket> { | ||
| let socket = match addr { | ||
| SocketAddr::V4(_) => TcpSocket::new_v4(), | ||
| SocketAddr::V6(_) => TcpSocket::new_v6(), | ||
| }?; | ||
|
|
||
| if let Some(iface) = self.iface { | ||
| zenoh_util::net::set_bind_to_device_tcp_socket(&socket, iface)?; | ||
| } | ||
| if let Some(size) = self.tx_buffer_size { | ||
| socket.set_send_buffer_size(size)?; | ||
| } | ||
| if let Some(size) = self.rx_buffer_size { | ||
| socket.set_recv_buffer_size(size)?; | ||
| } | ||
|
|
||
| Ok(socket) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.