From f5fad5b43d7287ef146477c7625d361d78cd5bcc Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 2 Dec 2019 18:11:10 -0800
Subject: [PATCH] Correctly parse ip echo server response and fix broken test
 (#7196) (#7200)

automerge
---
 net-utils/src/lib.rs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/net-utils/src/lib.rs b/net-utils/src/lib.rs
index 295b456967..04faebb20f 100644
--- a/net-utils/src/lib.rs
+++ b/net-utils/src/lib.rs
@@ -75,7 +75,7 @@ fn ip_echo_server_request(
                 ));
             }
 
-            bincode::deserialize(&data[3..]).map_err(|err| {
+            bincode::deserialize(&data[4..]).map_err(|err| {
                 io::Error::new(
                     io::ErrorKind::Other,
                     format!("Failed to deserialize: {:?}", err),
@@ -481,7 +481,10 @@ mod tests {
         let _runtime = ip_echo_server(server_tcp_listener);
 
         let ip_echo_server_addr = server_udp_socket.local_addr().unwrap();
-        get_public_ip_addr(&ip_echo_server_addr).unwrap();
+        assert_eq!(
+            get_public_ip_addr(&ip_echo_server_addr),
+            parse_host("127.0.0.1"),
+        );
 
         verify_reachable_ports(
             &ip_echo_server_addr,