Core/grin
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin.git synced 2025-01-21 03:21:08 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Attempt to read ipv4-mapped ipv6 to ipv4 if possible (#3221)

Browse source
This commit is contained in:
Quentin Le Sceller 2020-02-14 09:37:14 -05:00 committed by GitHub
parent 65e4f7efe0
commit b400a4b1cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
p2p/src/types.rs
View file

@ -143,13 +143,15 @@ impl Readable for PeerAddr {
))))
} else {
let ip = try_iter_map_vec!(0..8, |_| reader.read_u16());
let ipv6 = Ipv6Addr::new(ip[0], ip[1], ip[2], ip[3], ip[4], ip[5], ip[6], ip[7]);
let port = reader.read_u16()?;
Ok(PeerAddr(SocketAddr::V6(SocketAddrV6::new(
Ipv6Addr::new(ip[0], ip[1], ip[2], ip[3], ip[4], ip[5], ip[6], ip[7]),
port,
0,
0,
))))
if let Some(ipv4) = ipv6.to_ipv4() {
Ok(PeerAddr(SocketAddr::V4(SocketAddrV4::new(ipv4, port))))
} else {
Ok(PeerAddr(SocketAddr::V6(SocketAddrV6::new(
ipv6, port, 0, 0,
))))
}
}
}
}