diff options
| author | Steven Fackler <sfackler@gmail.com> | 2016-04-20 21:42:19 -0700 |
|---|---|---|
| committer | Steven Fackler <sfackler@gmail.com> | 2016-04-20 21:42:19 -0700 |
| commit | c6480e8b6b13401030c52f3c2b4fcc4e80c14481 (patch) | |
| tree | 92c102ee0566a100d008eff426235519e287b288 /src/libstd | |
| parent | a0c325980367d5ee981145e31c70585acee40cd2 (diff) | |
| download | rust-c6480e8b6b13401030c52f3c2b4fcc4e80c14481.tar.gz rust-c6480e8b6b13401030c52f3c2b4fcc4e80c14481.zip | |
Remove IPV6_V6ONLY functionality
These settings can only be adjusted before bind time, which doesn't make sense in the current set of functionality. These methods are stable, but haven't hit a stable release yet. Closes #33052 [breaking-change]
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/net/tcp.rs | 23 | ||||
| -rw-r--r-- | src/libstd/net/udp.rs | 23 | ||||
| -rw-r--r-- | src/libstd/sys/common/net.rs | 18 |
3 files changed, 0 insertions, 64 deletions
diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs index 38da74b8903..a7738e31700 100644 --- a/src/libstd/net/tcp.rs +++ b/src/libstd/net/tcp.rs @@ -221,29 +221,6 @@ impl TcpStream { self.0.ttl() } - /// Sets the value for the `IPV6_V6ONLY` option on this socket. - /// - /// If this is set to `true` then the socket is restricted to sending and - /// receiving IPv6 packets only. If this is the case, an IPv4 and an IPv6 - /// application can each bind the same port at the same time. - /// - /// If this is set to `false` then the socket can be used to send and - /// receive packets from an IPv4-mapped IPv6 address. - #[stable(feature = "net2_mutators", since = "1.9.0")] - pub fn set_only_v6(&self, only_v6: bool) -> io::Result<()> { - self.0.set_only_v6(only_v6) - } - - /// Gets the value of the `IPV6_V6ONLY` option for this socket. - /// - /// For more information about this option, see [`set_only_v6`][link]. - /// - /// [link]: #method.set_only_v6 - #[stable(feature = "net2_mutators", since = "1.9.0")] - pub fn only_v6(&self) -> io::Result<bool> { - self.0.only_v6() - } - /// Get the value of the `SO_ERROR` option on this socket. /// /// This will retrieve the stored error in the underlying socket, clearing diff --git a/src/libstd/net/udp.rs b/src/libstd/net/udp.rs index 0be9f13e817..4683c7061c3 100644 --- a/src/libstd/net/udp.rs +++ b/src/libstd/net/udp.rs @@ -243,29 +243,6 @@ impl UdpSocket { self.0.ttl() } - /// Sets the value for the `IPV6_V6ONLY` option on this socket. - /// - /// If this is set to `true` then the socket is restricted to sending and - /// receiving IPv6 packets only. If this is the case, an IPv4 and an IPv6 - /// application can each bind the same port at the same time. - /// - /// If this is set to `false` then the socket can be used to send and - /// receive packets from an IPv4-mapped IPv6 address. - #[stable(feature = "net2_mutators", since = "1.9.0")] - pub fn set_only_v6(&self, only_v6: bool) -> io::Result<()> { - self.0.set_only_v6(only_v6) - } - - /// Gets the value of the `IPV6_V6ONLY` option for this socket. - /// - /// For more information about this option, see [`set_only_v6`][link]. - /// - /// [link]: #method.set_only_v6 - #[stable(feature = "net2_mutators", since = "1.9.0")] - pub fn only_v6(&self) -> io::Result<bool> { - self.0.only_v6() - } - /// Executes an operation of the `IP_ADD_MEMBERSHIP` type. /// /// This function specifies a new multicast group for this socket to join. diff --git a/src/libstd/sys/common/net.rs b/src/libstd/sys/common/net.rs index d5d967114c4..54b9b466c42 100644 --- a/src/libstd/sys/common/net.rs +++ b/src/libstd/sys/common/net.rs @@ -247,15 +247,6 @@ impl TcpStream { Ok(raw as u32) } - pub fn set_only_v6(&self, only_v6: bool) -> io::Result<()> { - setsockopt(&self.inner, c::IPPROTO_IPV6, c::IPV6_V6ONLY, only_v6 as c_int) - } - - pub fn only_v6(&self) -> io::Result<bool> { - let raw: c_int = getsockopt(&self.inner, c::IPPROTO_IPV6, c::IPV6_V6ONLY)?; - Ok(raw != 0) - } - pub fn take_error(&self) -> io::Result<Option<io::Error>> { self.inner.take_error() } @@ -544,15 +535,6 @@ impl UdpSocket { Ok(raw as u32) } - pub fn set_only_v6(&self, only_v6: bool) -> io::Result<()> { - setsockopt(&self.inner, c::IPPROTO_IPV6, c::IPV6_V6ONLY, only_v6 as c_int) - } - - pub fn only_v6(&self) -> io::Result<bool> { - let raw: c_int = getsockopt(&self.inner, c::IPPROTO_IPV6, c::IPV6_V6ONLY)?; - Ok(raw != 0) - } - pub fn take_error(&self) -> io::Result<Option<io::Error>> { self.inner.take_error() } |
