aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJake McGinty <me@jake.su>2018-04-23 14:31:30 -0700
committerJake McGinty <me@jake.su>2018-04-23 14:31:30 -0700
commit88a16bff6659bcd6e52ee7dc6933582ccb8f0b37 (patch)
treee9352e3f76e8353927e2f5f63ac06e72ec34b548
parentudp: retry sends without pktinfo if they failed (diff)
downloadwireguard-rs-88a16bff6659bcd6e52ee7dc6933582ccb8f0b37.tar.xz
wireguard-rs-88a16bff6659bcd6e52ee7dc6933582ccb8f0b37.zip
bench: fix build from SocketAddr -> Endpoint transition
-rw-r--r--benches/criterion.rs9
1 files changed, 4 insertions, 5 deletions
diff --git a/benches/criterion.rs b/benches/criterion.rs
index 24ab8f8..c507dd5 100644
--- a/benches/criterion.rs
+++ b/benches/criterion.rs
@@ -15,8 +15,7 @@ use wireguard::noise;
use wireguard::time::Timestamp;
use x25519_dalek::{generate_secret, generate_public};
use rand::OsRng;
-use std::convert::TryInto;
-use std::time::Duration;
+use std::{convert::TryInto, net::SocketAddr, time::Duration};
use pnet_packet::{Packet, ipv4::MutableIpv4Packet};
//use std::io::Write;
//use socket2::{Socket, Domain, Type, Protocol};
@@ -65,11 +64,11 @@ fn connected_peers() -> (Peer, [u8; 32], Peer, [u8; 32]) {
resp_session.birthday = Timestamp::now();
peer_init.sessions.current = Some(init_session);
- peer_init.info.endpoint = Some(([127, 0, 0, 1], 443).into());
+ peer_init.info.endpoint = Some(SocketAddr::from(([127, 0, 0, 1], 443)).into());
peer_init.info.pub_key = resp_keys.public;
peer_resp.sessions.current = Some(resp_session);
- peer_resp.info.endpoint = Some(([127, 0, 0, 1], 443).into());
+ peer_resp.info.endpoint = Some(SocketAddr::from(([127, 0, 0, 1], 443)).into());
peer_resp.info.pub_key = init_keys.public;
(peer_init, init_keys.private, peer_resp, resp_keys.private)
@@ -87,7 +86,7 @@ fn benchmarks(c: &mut Criterion) {
let (mut peer_init, init_priv, mut peer_resp, resp_priv) = connected_peers();
let (_, init, _) = peer_init.initiate_new_session(&init_priv, 1).expect("initiate");
let init = init.try_into().unwrap();
- let addr = ([127, 0, 0, 1], 443).into();
+ let addr = SocketAddr::from(([127, 0, 0, 1], 443)).into();
b.iter(move || {
peer_resp.last_handshake_tai64n = None;
let handshake = Peer::process_incoming_handshake(&resp_priv, &init).unwrap();