aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJake McGinty <me@jake.su>2018-04-17 18:10:13 -0700
committerJake McGinty <me@jake.su>2018-04-22 14:09:08 -0700
commitf6e79449f1822f0ea91f7ff47ebf5a4923227efa (patch)
treec8440018e104a457d7c8e3ebb9259eea965bae38
parenttests: disable iperf tests in netns for now (diff)
downloadwireguard-rs-f6e79449f1822f0ea91f7ff47ebf5a4923227efa.tar.xz
wireguard-rs-f6e79449f1822f0ea91f7ff47ebf5a4923227efa.zip
udp: use SocketAddr::from for udp binding
-rw-r--r--src/udp/mod.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/udp/mod.rs b/src/udp/mod.rs
index 01303af..6730824 100644
--- a/src/udp/mod.rs
+++ b/src/udp/mod.rs
@@ -88,18 +88,18 @@ impl UdpSocket {
let socket4 = Socket::new(Domain::ipv4(), Type::dgram(), Some(Protocol::udp()))?;
let socket6 = Socket::new(Domain::ipv6(), Type::dgram(), Some(Protocol::udp()))?;
- setsockopt(socket4.as_raw_fd(), sockopt::Ipv4PacketInfo, &true);
- setsockopt(socket6.as_raw_fd(), sockopt::Ipv6RecvPacketInfo, &true);
-
socket4.set_nonblocking(true)?;
socket4.set_reuse_address(true)?;
- socket6.set_only_v6(true)?;
socket6.set_nonblocking(true)?;
socket6.set_reuse_address(true)?;
+ socket6.set_only_v6(true)?;
+
+ setsockopt(socket4.as_raw_fd(), sockopt::Ipv4PacketInfo, &true);
+ setsockopt(socket6.as_raw_fd(), sockopt::Ipv6RecvPacketInfo, &true);
- socket4.bind(&SocketAddrV4::new(Ipv4Addr::unspecified(), port).into())?;
- socket6.bind(&SocketAddrV6::new(Ipv6Addr::unspecified(), port, 0, 0).into())?;
+ socket4.bind(&SocketAddr::from((Ipv4Addr::unspecified(), port)).into())?;
+ socket6.bind(&SocketAddr::from((Ipv6Addr::unspecified(), port)).into())?;
let socket4 = mio::net::UdpSocket::from_socket(socket4.into_udp_socket())?;
let socket6 = mio::net::UdpSocket::from_socket(socket6.into_udp_socket())?;