diff --git a/libp2p-websocket/Cargo.toml b/libp2p-websocket/Cargo.toml index 52144403..00f8f06d 100644 --- a/libp2p-websocket/Cargo.toml +++ b/libp2p-websocket/Cargo.toml @@ -7,6 +7,7 @@ authors = ["Parity Technologies "] libp2p-swarm = { path = "../libp2p-swarm" } futures = "0.1" multiaddr = "0.2.0" +log = "0.4.1" rw-stream-sink = { path = "../rw-stream-sink" } tokio-io = "0.1" diff --git a/libp2p-websocket/src/browser.rs b/libp2p-websocket/src/browser.rs index 681c528c..14939c2e 100644 --- a/libp2p-websocket/src/browser.rs +++ b/libp2p-websocket/src/browser.rs @@ -72,6 +72,8 @@ impl Transport for BrowserWsConfig { Err(_) => return Err((self, original_addr)), }; + debug!(target: "libp2p-websocket", "Dialing {}", original_addr); + // Create the JS `WebSocket` object. let websocket = { let val = js! { diff --git a/libp2p-websocket/src/desktop.rs b/libp2p-websocket/src/desktop.rs index f5271098..425cae8a 100644 --- a/libp2p-websocket/src/desktop.rs +++ b/libp2p-websocket/src/desktop.rs @@ -89,11 +89,14 @@ where } }; + debug!(target: "libp2p-websocket", "Listening on {}", new_addr); + let listen = inner_listen.map::<_, fn(_) -> _>(|stream| { // Upgrade the listener to websockets like the websockets library requires us to do. let upgraded = stream.and_then(|(stream, mut client_addr)| { // Need to suffix `/ws` to each client address. client_addr.append(AddrComponent::WS); + debug!(target: "libp2p-websocket", "Incoming connection from {}", client_addr); stream .into_ws() @@ -104,6 +107,9 @@ where .accept() .map_err(|err| IoError::new(IoErrorKind::Other, err)) .map(|(client, _http_headers)| { + debug!(target: "libp2p-websocket", "Upgraded incoming connection \ + to websockets"); + // Plug our own API on top of the `websockets` API. let framed_data = client .map_err(|err| IoError::new(IoErrorKind::Other, err)) @@ -147,6 +153,8 @@ where _ => return Err((self, original_addr)), }; + debug!(target: "libp2p-websocket", "Dialing {} through inner transport", inner_addr); + let inner_dial = match self.transport.dial(inner_addr) { Ok(d) => d, Err((transport, _)) => { @@ -172,6 +180,9 @@ where .async_connect_on(connec) .map_err(|err| IoError::new(IoErrorKind::Other, err)) .map(|(client, _)| { + debug!(target: "libp2p-websocket", "Upgraded outgoing connection to \ + websockets"); + // Plug our own API on top of the API of the websockets library. let framed_data = client .map_err(|err| IoError::new(IoErrorKind::Other, err)) diff --git a/libp2p-websocket/src/lib.rs b/libp2p-websocket/src/lib.rs index 148f9b75..2819968e 100644 --- a/libp2p-websocket/src/lib.rs +++ b/libp2p-websocket/src/lib.rs @@ -76,6 +76,8 @@ extern crate futures; extern crate libp2p_swarm as swarm; +#[macro_use] +extern crate log; extern crate multiaddr; extern crate rw_stream_sink; extern crate tokio_io;