From 2871ad50558ad2f672cc0a6fb599267819cda7c1 Mon Sep 17 00:00:00 2001
From: Age Manning <Age@AgeManning.com>
Date: Sun, 17 Mar 2019 14:25:47 +1100
Subject: [PATCH] Correct listening addresses and associated log

---
 beacon_node/Cargo.toml                  | 1 +
 beacon_node/client/src/client_config.rs | 6 ++++++
 beacon_node/src/run.rs                  | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/beacon_node/Cargo.toml b/beacon_node/Cargo.toml
index 56f5c654e2..6be030fd58 100644
--- a/beacon_node/Cargo.toml
+++ b/beacon_node/Cargo.toml
@@ -5,6 +5,7 @@ authors = ["Paul Hauner <paul@paulhauner.com>", "Age Manning <Age@AgeManning.com
 edition = "2018"
 
 [dependencies]
+types = { path = "../eth2/types" }
 client = { path = "client" }
 version = { path = "version" }
 clap = "2.32.0"
diff --git a/beacon_node/client/src/client_config.rs b/beacon_node/client/src/client_config.rs
index bc3a782796..4fe390cb10 100644
--- a/beacon_node/client/src/client_config.rs
+++ b/beacon_node/client/src/client_config.rs
@@ -7,6 +7,7 @@ use std::fs;
 use std::net::IpAddr;
 use std::net::SocketAddr;
 use std::path::PathBuf;
+use types::multiaddr::Protocol;
 use types::multiaddr::ToMultiaddr;
 use types::ChainSpec;
 
@@ -62,6 +63,11 @@ impl ClientConfig {
         if let Some(port_str) = args.value_of("port") {
             if let Ok(port) = port_str.parse::<u16>() {
                 config.net_conf.listen_port = port;
+                // update the listening multiaddrs
+                for address in &mut config.net_conf.listen_addresses {
+                    address.pop();
+                    address.append(Protocol::Tcp(port));
+                }
             } else {
                 error!(log, "Invalid port"; "port" => port_str);
                 return Err("Invalid port");
diff --git a/beacon_node/src/run.rs b/beacon_node/src/run.rs
index cfae001a02..12d761d84c 100644
--- a/beacon_node/src/run.rs
+++ b/beacon_node/src/run.rs
@@ -14,7 +14,7 @@ pub fn run_beacon_node(config: ClientConfig, log: slog::Logger) -> error::Result
         .map_err(|e| format!("{:?}", e))?;
 
     // Log configuration
-    info!(log, "";
+    info!(log, "Listening on {:?}", &config.net_conf.listen_addresses;
           "data_dir" => &config.data_dir.to_str(),
           "port" => &config.net_conf.listen_port);