aboutsummaryrefslogtreecommitdiffstats
path: root/src/interface
diff options
context:
space:
mode:
authorJake McGinty <me@jake.su>2018-04-13 20:23:53 -0700
committerJake McGinty <me@jake.su>2018-04-22 14:08:41 -0700
commit930f4effb5abc7cb27b178657f2ec99b29da9e34 (patch)
tree23c22810350ccd28fc105361b59e0516dd3ab9fb /src/interface
parentudp: remove the unused Connected/Unconnected UDP enum (diff)
downloadwireguard-rs-930f4effb5abc7cb27b178657f2ec99b29da9e34.tar.xz
wireguard-rs-930f4effb5abc7cb27b178657f2ec99b29da9e34.zip
udp: dual-stack single socket -> dual socket
Diffstat (limited to 'src/interface')
-rw-r--r--src/interface/peer_server.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/interface/peer_server.rs b/src/interface/peer_server.rs
index 509d8c2..2b05b94 100644
--- a/src/interface/peer_server.rs
+++ b/src/interface/peer_server.rs
@@ -8,7 +8,7 @@ use time::Timestamp;
use timer::{Timer, TimerMessage};
use std::convert::TryInto;
-use std::net::{Ipv6Addr, SocketAddr};
+use std::net::SocketAddr;
use std::time::Duration;
use byteorder::{ByteOrder, LittleEndian};
@@ -68,8 +68,8 @@ impl PeerServer {
return Ok(())
}
- let socket = UdpSocket::bind((Ipv6Addr::unspecified(), port).into(), self.handle.clone())?;
- info!("listening on {:?}", socket.local_addr()?);
+ let socket = UdpSocket::bind(port, self.handle.clone())?;
+ info!("listening on {:?}", socket.local_addrs()?);
let udp: UdpChannel = socket.framed().into();
@@ -126,7 +126,7 @@ impl PeerServer {
let mut state = self.shared_state.borrow_mut();
{
let (mac_in, mac_out) = packet.split_at(116);
- self.cookie.verify_mac1(mac_in, &mac_out[..16])?;
+ self.cookie.verify_mac1(&mac_in[..], &mac_out[..16])?;
}
debug!("got handshake initiation request (0x01)");
@@ -157,7 +157,7 @@ impl PeerServer {
let mut state = self.shared_state.borrow_mut();
{
let (mac_in, mac_out) = packet.split_at(60);
- self.cookie.verify_mac1(mac_in, &mac_out[..16])?;
+ self.cookie.verify_mac1(&mac_in[..], &mac_out[..16])?;
}
debug!("got handshake response (0x02)");