From 5c808842c070831238e1723f26bdf129e911dc85 Mon Sep 17 00:00:00 2001 From: David CARLIER Date: Sun, 8 Dec 2024 09:53:03 +0000 Subject: [PATCH] sys::socket adding GetOnly `TCP_FUNCTION_ALIAS` for freebsd. (#2558) to complete `TCP_FUNCTION_BLK` as to get the alias name, if existent, of the TCP stack. --- changelog/2558.added.md | 1 + src/sys/socket/sockopt.rs | 13 +++++++++++++ test/sys/test_sockopt.rs | 9 ++++++++- 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 changelog/2558.added.md diff --git a/changelog/2558.added.md b/changelog/2558.added.md new file mode 100644 index 0000000000..9940c30f8e --- /dev/null +++ b/changelog/2558.added.md @@ -0,0 +1 @@ +Add the `TCP_FUNCTION_ALIAS` sockopt, on FreeBSD. diff --git a/src/sys/socket/sockopt.rs b/src/sys/socket/sockopt.rs index fec7fc5af5..7ec4f68f07 100644 --- a/src/sys/socket/sockopt.rs +++ b/src/sys/socket/sockopt.rs @@ -330,6 +330,19 @@ sockopt_impl!( libc::TCP_FUNCTION_BLK, libc::tcp_function_set ); +#[cfg(target_os = "freebsd")] +#[cfg(feature = "net")] +sockopt_impl!( + #[cfg_attr(docsrs, doc(cfg(feature = "net")))] + /// Query the alias name of the set of function of the socket's TCP stack. + /// Uses the same field for the main name when getting from TCP_FUNCTION_BLK. + /// Empty if no alias. + TcpFunctionAlias, + GetOnly, + libc::IPPROTO_TCP, + libc::TCP_FUNCTION_ALIAS, + libc::tcp_function_set +); sockopt_impl!( #[cfg_attr(docsrs, doc(cfg(feature = "net")))] /// Used to disable Nagle's algorithm. diff --git a/test/sys/test_sockopt.rs b/test/sys/test_sockopt.rs index 864604bd19..b40fb08d08 100644 --- a/test/sys/test_sockopt.rs +++ b/test/sys/test_sockopt.rs @@ -291,7 +291,7 @@ fn test_tcp_congestion() { #[test] #[cfg(target_os = "freebsd")] -fn test_tcp_function_blk() { +fn test_tcp_function_blk_alias() { use std::ffi::CStr; let fd = socket( @@ -306,8 +306,15 @@ fn test_tcp_function_blk() { let name = unsafe { CStr::from_ptr(tfs.function_set_name.as_ptr()) }; assert!(!name.to_bytes().is_empty()); + let aliastfs = getsockopt(&fd, sockopt::TcpFunctionAlias).unwrap(); + let aliasname = + unsafe { CStr::from_ptr(aliastfs.function_set_name.as_ptr()) }; + // freebsd default tcp stack has no alias. + assert!(aliasname.to_bytes().is_empty()); + // We can't know at compile time what options are available. So just test the setter by a // no-op set. + // TODO: test if we can load for example BBR tcp stack kernel module. setsockopt(&fd, sockopt::TcpFunctionBlk, &tfs).unwrap(); }