Fix netutils test (#10842)

This commit is contained in:
Greg Fitzgerald 2020-06-30 09:57:16 -06:00 committed by GitHub
parent cabedc0f36
commit 3a3b7a399a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 0 deletions

1
Cargo.lock generated
View File

@ -4386,6 +4386,7 @@ dependencies = [
"solana-version",
"tokio 0.1.22",
"tokio-codec",
"url 2.1.1",
]
[[package]]

View File

@ -23,6 +23,7 @@ solana-logger = { path = "../logger", version = "1.3.0" }
solana-version = { path = "../version", version = "1.3.0" }
tokio = "0.1"
tokio-codec = "0.1"
url = "2.1.1"
[lib]
name = "solana_net_utils"

View File

@ -7,6 +7,7 @@ use std::io::{self, Read, Write};
use std::net::{IpAddr, SocketAddr, TcpListener, TcpStream, ToSocketAddrs, UdpSocket};
use std::sync::mpsc::channel;
use std::time::Duration;
use url::Url;
mod ip_echo_server;
use ip_echo_server::IpEchoServerMessage;
@ -298,6 +299,14 @@ pub fn parse_port_range(port_range: &str) -> Option<PortRange> {
}
pub fn parse_host(host: &str) -> Result<IpAddr, String> {
// First, check if the host syntax is valid. This check is needed because addresses
// such as `("localhost:1234", 0)` will resolve to IPs on some networks.
let parsed_url = Url::parse(&format!("http://{}", host)).map_err(|e| e.to_string())?;
if parsed_url.port().is_some() {
return Err(format!("Expected port in URL: {}", host));
}
// Next, check to see if it resolves to an IP address
let ips: Vec<_> = (host, 0)
.to_socket_addrs()
.map_err(|err| err.to_string())?