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

Detect unspecified IP and use TCP conn IP instead

Browse source
This commit is contained in:
Ignotus Peverell 2017-11-03 16:47:35 -04:00
parent ad07866275
commit 15705b3fa1
No known key found for this signature in database
GPG key ID: 99CD25F39F8F8211
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
p2p/src/handshake.rs
View file

@ -172,14 +172,16 @@ impl Handshake {
fn extract_ip(advertised: &SocketAddr, conn: &TcpStream) -> SocketAddr { fn extract_ip(advertised: &SocketAddr, conn: &TcpStream) -> SocketAddr {
match advertised { match advertised {
&SocketAddr::V4(v4sock) => { &SocketAddr::V4(v4sock) => {
if v4sock.ip().is_loopback() { let ip = v4sock.ip();
if ip.is_loopback() || ip.is_unspecified() {
if let Ok(addr) = conn.peer_addr() { if let Ok(addr) = conn.peer_addr() {
return SocketAddr::new(addr.ip(), advertised.port()); return SocketAddr::new(addr.ip(), advertised.port());
} }
} }
} }
&SocketAddr::V6(v6sock) => { &SocketAddr::V6(v6sock) => {
if v6sock.ip().is_loopback() { let ip = v6sock.ip();
if ip.is_loopback() || ip.is_unspecified() {
if let Ok(addr) = conn.peer_addr() { if let Ok(addr) = conn.peer_addr() {
return SocketAddr::new(addr.ip(), advertised.port()); return SocketAddr::new(addr.ip(), advertised.port());
} }