diff options
Diffstat (limited to '')
| -rw-r--r-- | src/wireguard/router/peer.rs | 6 | ||||
| -rw-r--r-- | src/wireguard/router/tests.rs | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/wireguard/router/peer.rs b/src/wireguard/router/peer.rs index 5467eb7..5522a3e 100644 --- a/src/wireguard/router/peer.rs +++ b/src/wireguard/router/peer.rs @@ -515,7 +515,7 @@ impl<E: Endpoint, C: Callbacks, T: tun::Writer, B: bind::Writer<E>> Peer<E, C, T /// /// If an identical value already exists as part of a prior peer, /// the allowed IP entry will be removed from that peer and added to this peer. - pub fn add_allowed_ips(&self, ip: IpAddr, masklen: u32) { + pub fn add_allowed_ip(&self, ip: IpAddr, masklen: u32) { debug!("peer.add_allowed_ips"); match ip { IpAddr::V4(v4) => { @@ -523,14 +523,14 @@ impl<E: Endpoint, C: Callbacks, T: tun::Writer, B: bind::Writer<E>> Peer<E, C, T .device .ipv4 .write() - .insert(v4, masklen, self.state.clone()) + .insert(v4.mask(masklen), masklen, self.state.clone()) } IpAddr::V6(v6) => { self.state .device .ipv6 .write() - .insert(v6, masklen, self.state.clone()) + .insert(v6.mask(masklen), masklen, self.state.clone()) } }; } diff --git a/src/wireguard/router/tests.rs b/src/wireguard/router/tests.rs index 1b122a8..d5a1133 100644 --- a/src/wireguard/router/tests.rs +++ b/src/wireguard/router/tests.rs @@ -152,7 +152,7 @@ mod tests { let (mask, len, ip) = ("192.168.1.0", 24, "192.168.1.20"); let mask: IpAddr = mask.parse().unwrap(); let ip1: IpAddr = ip.parse().unwrap(); - peer.add_allowed_ips(mask, len); + peer.add_allowed_ip(mask, len); // every iteration sends 10 GB b.iter(|| { @@ -210,7 +210,7 @@ mod tests { } // map subnet to peer - peer.add_allowed_ips(mask, *len); + peer.add_allowed_ip(mask, *len); // create "IP packet" let msg = make_packet_dst_padded(1024, ip.parse().unwrap(), 0); @@ -334,13 +334,13 @@ mod tests { let (mask, len, _ip, _okay) = p1; let peer1 = router1.new_peer(opaq1.clone()); let mask: IpAddr = mask.parse().unwrap(); - peer1.add_allowed_ips(mask, *len); + peer1.add_allowed_ip(mask, *len); peer1.add_keypair(dummy_keypair(false)); let (mask, len, _ip, _okay) = p2; let peer2 = router2.new_peer(opaq2.clone()); let mask: IpAddr = mask.parse().unwrap(); - peer2.add_allowed_ips(mask, *len); + peer2.add_allowed_ip(mask, *len); peer2.set_endpoint(dummy::UnitEndpoint::new()); if *stage { |