From 6b7eeb246c6ccb55f028eadb59bfb75f3b1eb8c0 Mon Sep 17 00:00:00 2001 From: Cameron Bytheway Date: Fri, 3 Jun 2022 12:57:54 -0600 Subject: [PATCH] Revert "fix(s2n-quic-transport): Unmap peer address when determining MTU probe size (#1321)" This reverts commit 88aa6a28468fff90b84d7e3b8f9dccbf3918dcd3. --- quic/s2n-quic-transport/src/path/mtu.rs | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/quic/s2n-quic-transport/src/path/mtu.rs b/quic/s2n-quic-transport/src/path/mtu.rs index 80132fc18b..3b6648a426 100644 --- a/quic/s2n-quic-transport/src/path/mtu.rs +++ b/quic/s2n-quic-transport/src/path/mtu.rs @@ -125,7 +125,7 @@ impl Controller { /// The UDP header length and IP header length will be subtracted from `max_mtu` to /// determine the max_udp_payload used for limiting the payload length of probe packets. pub fn new(max_mtu: MaxMtu, peer_socket_address: &SocketAddress) -> Self { - let min_ip_header_len = match peer_socket_address.unmap() { + let min_ip_header_len = match peer_socket_address { SocketAddress::IpV4(_) => IPV4_MIN_HEADER_LEN, SocketAddress::IpV6(_) => IPV6_MIN_HEADER_LEN, }; @@ -524,26 +524,6 @@ mod test { ); } - #[test] - fn new_ipv6_mapped() { - let addr: SocketAddr = "127.0.0.1:443".parse().unwrap(); - let addr: SocketAddress = addr.into(); - let controller = Controller::new(1600.try_into().unwrap(), &addr.to_ipv6_mapped().into()); - - assert_eq!( - 1600 - UDP_HEADER_LEN - IPV4_MIN_HEADER_LEN, - controller.max_udp_payload - ); - assert_eq!( - 1600 - UDP_HEADER_LEN - IPV4_MIN_HEADER_LEN, - controller.max_probe_size - ); - assert_eq!( - ETHERNET_MTU - UDP_HEADER_LEN - IPV4_MIN_HEADER_LEN, - controller.probed_size - ); - } - #[test] fn enable_already_enabled() { let mut controller = new_controller(1500);