diff --git a/core/src/nodes/listeners.rs b/core/src/nodes/listeners.rs index 64441cfa..70767f52 100644 --- a/core/src/nodes/listeners.rs +++ b/core/src/nodes/listeners.rs @@ -188,7 +188,9 @@ where if remaining == 0 { break } } Ok(Async::Ready(Some(ListenerEvent::Upgrade { upgrade, listen_addr, remote_addr }))) => { - debug_assert!(listener.addresses.contains(&listen_addr)); + debug_assert!(listener.addresses.contains(&listen_addr), + "Transport reported listen address {} not in the list: {:?}", + listen_addr, listener.addresses); self.listeners.push_front(listener); return Async::Ready(ListenersEvent::Incoming { upgrade, @@ -197,6 +199,8 @@ where }) } Ok(Async::Ready(Some(ListenerEvent::NewAddress(a)))) => { + debug_assert!(!listener.addresses.contains(&a), + "Transport has reported address {} multiple times", a); if !listener.addresses.contains(&a) { listener.addresses.push(a.clone()); } diff --git a/transports/tcp/Cargo.toml b/transports/tcp/Cargo.toml index 4998fd59..9c37b834 100644 --- a/transports/tcp/Cargo.toml +++ b/transports/tcp/Cargo.toml @@ -2,7 +2,7 @@ name = "libp2p-tcp" edition = "2018" description = "TCP/IP transport protocol for libp2p" -version = "0.7.0" +version = "0.7.2" authors = ["Parity Technologies "] license = "MIT" repository = "https://github.com/libp2p/rust-libp2p" diff --git a/transports/tcp/src/lib.rs b/transports/tcp/src/lib.rs index 6441d2dc..5edfb442 100644 --- a/transports/tcp/src/lib.rs +++ b/transports/tcp/src/lib.rs @@ -49,7 +49,7 @@ use libp2p_core::{ multiaddr::{Protocol, Multiaddr}, transport::{ListenerEvent, TransportError} }; -use log::{debug, error}; +use log::{debug, error, trace}; use std::{ collections::{HashMap, VecDeque}, fmt, @@ -422,7 +422,7 @@ impl Stream for TcpListenStream { match apply_config(&self.config, &sock) { Ok(()) => { - debug!("Incoming connection from {}", remote_addr); + trace!("Incoming connection from {} on {}", remote_addr, listen_addr); self.pending.push_back(ListenerEvent::Upgrade { upgrade: future::ok(TcpTransStream { inner: sock }), listen_addr, @@ -430,6 +430,7 @@ impl Stream for TcpListenStream { }) } Err(err) => { + debug!("Error upgrading incoming connection from {}: {:?}", remote_addr, err); self.pending.push_back(ListenerEvent::Upgrade { upgrade: future::err(err), listen_addr,