Add tcp prefix to TCP multiple methods

* keepalive_time
* keepalive_interval
* keepalive_retries
* nodelay
* set_nodelay

Author: Thomasdezeeuw

src/socket.rs

@@ -2119,8 +2119,8 @@ impl Socket {
             target_os = "vita"
         ))
     ))]
-    pub fn keepalive_time(&self) -> io::Result<Duration> {
-        sys::keepalive_time(self.as_raw())
+    pub fn tcp_keepalive_time(&self) -> io::Result<Duration> {
+        sys::tcp_keepalive_time(self.as_raw())
     }
 
     /// Get the value of the `TCP_KEEPINTVL` option on this socket.
@@ -2146,7 +2146,7 @@ impl Socket {
             target_os = "cygwin",
         )
     ))]
-    pub fn keepalive_interval(&self) -> io::Result<Duration> {
+    pub fn tcp_keepalive_interval(&self) -> io::Result<Duration> {
         unsafe {
             getsockopt::<c_int>(self.as_raw(), sys::IPPROTO_TCP, sys::TCP_KEEPINTVL)
                 .map(|secs| Duration::from_secs(secs as u64))
@@ -2177,7 +2177,7 @@ impl Socket {
             target_os = "windows",
         )
     ))]
-    pub fn keepalive_retries(&self) -> io::Result<u32> {
+    pub fn tcp_keepalive_retries(&self) -> io::Result<u32> {
         unsafe {
             getsockopt::<c_int>(self.as_raw(), sys::IPPROTO_TCP, sys::TCP_KEEPCNT)
                 .map(|retries| retries as u32)
@@ -2229,10 +2229,10 @@ impl Socket {
 
     /// Get the value of the `TCP_NODELAY` option on this socket.
     ///
-    /// For more information about this option, see [`set_nodelay`].
+    /// For more information about this option, see [`set_tcp_nodelay`].
     ///
-    /// [`set_nodelay`]: Socket::set_nodelay
-    pub fn nodelay(&self) -> io::Result<bool> {
+    /// [`set_tcp_nodelay`]: Socket::set_tcp_nodelay
+    pub fn tcp_nodelay(&self) -> io::Result<bool> {
         unsafe {
             getsockopt::<Bool>(self.as_raw(), sys::IPPROTO_TCP, sys::TCP_NODELAY)
                 .map(|nodelay| nodelay != 0)
@@ -2246,7 +2246,7 @@ impl Socket {
     /// small amount of data. When not set, data is buffered until there is a
     /// sufficient amount to send out, thereby avoiding the frequent sending of
     /// small packets.
-    pub fn set_nodelay(&self, nodelay: bool) -> io::Result<()> {
+    pub fn set_tcp_nodelay(&self, nodelay: bool) -> io::Result<()> {
         unsafe {
             setsockopt(
                 self.as_raw(),

src/sockref.rs

@@ -49,8 +49,8 @@ use crate::Socket;
 ///
 /// // Create a `SockRef`erence to the stream.
 /// let socket_ref = SockRef::from(&stream);
-/// // Use `Socket::set_nodelay` on the stream.
-/// socket_ref.set_nodelay(true)?;
+/// // Use `Socket::set_tcp_nodelay` on the stream.
+/// socket_ref.set_tcp_nodelay(true)?;
 /// drop(socket_ref);
 ///
 /// assert_eq!(stream.nodelay()?, true);

src/sys/unix.rs

@@ -1565,9 +1565,9 @@ impl crate::Socket {
 
     /// Gets the value of the `TCP_MAXSEG` option on this socket.
     ///
-    /// For more information about this option, see [`set_mss`].
+    /// For more information about this option, see [`set_tcp_mss`].
     ///
-    /// [`set_mss`]: crate::Socket::set_mss
+    /// [`set_tcp_mss`]: crate::Socket::set_tcp_mss
     #[cfg(all(feature = "all", not(target_os = "redox")))]
     pub fn tcp_mss(&self) -> io::Result<u32> {
         unsafe {
@@ -1690,9 +1690,9 @@ impl crate::Socket {
 
     /// Get the value of the `TCP_CORK` option on this socket.
     ///
-    /// For more information about this option, see [`set_cork`].
+    /// For more information about this option, see [`set_tcp_cork`].
     ///
-    /// [`set_cork`]: crate::Socket::set_cork
+    /// [`set_tcp_cork`]: crate::Socket::set_tcp_cork
     #[cfg(all(
         feature = "all",
         any(target_os = "android", target_os = "fuchsia", target_os = "linux")
@@ -1727,9 +1727,9 @@ impl crate::Socket {
 
     /// Get the value of the `TCP_QUICKACK` option on this socket.
     ///
-    /// For more information about this option, see [`set_quickack`].
+    /// For more information about this option, see [`set_tcp_quickack`].
     ///
-    /// [`set_quickack`]: crate::Socket::set_quickack
+    /// [`set_tcp_quickack`]: crate::Socket::set_tcp_quickack
     #[cfg(all(
         feature = "all",
         any(
@@ -1774,9 +1774,9 @@ impl crate::Socket {
 
     /// Get the value of the `TCP_THIN_LINEAR_TIMEOUTS` option on this socket.
     ///
-    /// For more information about this option, see [`set_thin_linear_timeouts`].
+    /// For more information about this option, see [`set_tcp_thin_linear_timeouts`].
     ///
-    /// [`set_thin_linear_timeouts`]: crate::Socket::set_thin_linear_timeouts
+    /// [`set_tcp_thin_linear_timeouts`]: crate::Socket::set_tcp_thin_linear_timeouts
     #[cfg(all(
         feature = "all",
         any(target_os = "android", target_os = "fuchsia", target_os = "linux")

tests/socket.rs

@@ -912,7 +912,10 @@ fn tcp_keepalive() {
         feature = "all",
         not(any(windows, target_os = "haiku", target_os = "openbsd"))
     ))]
-    assert_eq!(socket.keepalive_time().unwrap(), Duration::from_secs(200));
+    assert_eq!(
+        socket.tcp_keepalive_time().unwrap(),
+        Duration::from_secs(200)
+    );
 
     #[cfg(all(
         feature = "all",
@@ -932,7 +935,7 @@ fn tcp_keepalive() {
         )
     ))]
     assert_eq!(
-        socket.keepalive_interval().unwrap(),
+        socket.tcp_keepalive_interval().unwrap(),
         Duration::from_secs(30)
     );
 
@@ -954,7 +957,7 @@ fn tcp_keepalive() {
             target_os = "windows",
         )
     ))]
-    assert_eq!(socket.keepalive_retries().unwrap(), 10);
+    assert_eq!(socket.tcp_keepalive_retries().unwrap(), 10);
 }
 
 #[cfg(all(feature = "all", any(target_os = "fuchsia", target_os = "linux")))]
@@ -1350,7 +1353,7 @@ const GET_BUF_SIZE: usize = SET_BUF_SIZE;
 #[cfg(target_os = "linux")]
 const GET_BUF_SIZE: usize = 2 * SET_BUF_SIZE;
 
-test!(nodelay, set_nodelay(true));
+test!(tcp_nodelay, set_tcp_nodelay(true));
 test!(
     recv_buffer_size,
     set_recv_buffer_size(SET_BUF_SIZE),
@@ -1383,8 +1386,8 @@ test!(reuse_port_lb, set_reuse_port_lb(true));
 ))]
 test!(
     #[cfg_attr(target_os = "linux", ignore = "Different value returned")]
-    mss,
-    set_mss(256)
+    tcp_mss,
+    set_tcp_mss(256)
 );
 #[cfg(all(feature = "all", target_os = "linux"))]
 test!(
@@ -1402,17 +1405,17 @@ test!(
     feature = "all",
     any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
-test!(cork, set_cork(true));
+test!(tcp_cork, set_tcp_cork(true));
 #[cfg(all(
     feature = "all",
     any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
-test!(quickack, set_quickack(false));
+test!(tcp_quickack, set_tcp_quickack(false));
 #[cfg(all(
     feature = "all",
     any(target_os = "android", target_os = "fuchsia", target_os = "linux")
 ))]
-test!(thin_linear_timeouts, set_thin_linear_timeouts(true));
+test!(tcp_thin_linear_timeouts, set_tcp_thin_linear_timeouts(true));
 test!(linger, set_linger(Some(Duration::from_secs(10))));
 test!(
     read_timeout,