gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

accept other socket errors, ignore unless out of tries (#1835)

Browse Source
This commit is contained in:
Rob Walker
2018-11-15 15:49:37 -08:00
committed by GitHub
parent 96e03eca14
commit d3e521f70e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/netutil.rs
View File

@ -126,7 +126,7 @@ pub fn bind_in_range(range: (u16, u16)) -> io::Result<(u16, UdpSocket)> {
break Result::Ok((sock.local_addr().unwrap().port(), sock)); break Result::Ok((sock.local_addr().unwrap().port(), sock));
} }
Err(err) => { Err(err) => {
if err.kind() != io::ErrorKind::AddrInUse || tries_left == 0 { if tries_left == 0 {
return Err(err); return Err(err);
} }
} }
@ -170,6 +170,8 @@ pub fn find_available_port_in_range(range: (u16, u16)) -> io::Result<u16> {
let mut tries_left = end - start; let mut tries_left = end - start;
let mut rand_port = thread_rng().gen_range(start, end); let mut rand_port = thread_rng().gen_range(start, end);
loop { loop {
eprintln!("trying port {}", rand_port);
match TcpListener::bind(SocketAddr::new( match TcpListener::bind(SocketAddr::new(
IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)),
rand_port, rand_port,
@ -178,7 +180,7 @@ pub fn find_available_port_in_range(range: (u16, u16)) -> io::Result<u16> {
break Ok(rand_port); break Ok(rand_port);
} }
Err(err) => { Err(err) => {
if err.kind() != io::ErrorKind::AddrInUse || tries_left == 0 { if tries_left == 0 {
return Err(err); return Err(err);
} }
} }