From 65b247a922bd23dd2a1d58b0749b8c0bb8e85de2 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Sat, 19 Sep 2020 23:22:45 -0700
Subject: [PATCH] Bind to correct RPC addresses

---
 validator/src/main.rs | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/validator/src/main.rs b/validator/src/main.rs
index 0794e48594..2957f04816 100644
--- a/validator/src/main.rs
+++ b/validator/src/main.rs
@@ -541,20 +541,18 @@ fn verify_reachable_ports(
 
     let mut tcp_listeners = vec![];
     if let Some((rpc_addr, rpc_pubsub_addr, rpc_banks_addr)) = validator_config.rpc_addrs {
-        for (purpose, addr) in &[
-            ("RPC", rpc_addr),
-            ("RPC pubsub", rpc_pubsub_addr),
-            ("RPC banks", rpc_banks_addr),
+        for (purpose, bind_addr, public_addr) in &[
+            ("RPC", rpc_addr, &node.info.rpc),
+            ("RPC pubsub", rpc_pubsub_addr, &node.info.rpc_pubsub),
+            ("RPC banks", rpc_banks_addr, &node.info.rpc_banks),
         ] {
-            if ContactInfo::is_valid_address(&addr) {
+            if ContactInfo::is_valid_address(&public_addr) {
                 tcp_listeners.push((
-                    addr.port(),
-                    TcpListener::bind(addr).unwrap_or_else(|err| {
+                    bind_addr.port(),
+                    TcpListener::bind(bind_addr).unwrap_or_else(|err| {
                         error!(
-                            "Unable to bind to tcp/{:?} for {}: {}",
-                            addr.port(),
-                            purpose,
-                            err
+                            "Unable to bind to tcp {:?} for {}: {}",
+                            bind_addr, purpose, err
                         );
                         exit(1);
                     }),