From: Sage Weil <sage@redhat.com>
Date: Thu, 20 Jul 2017 17:59:45 +0000 (-0400)
Subject: msg: restore peer addr checks
X-Git-Tag: v12.1.2~184^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8e6a15d01ae5f36169b3ba9f53d81a9afcc9d355;p=ceph.git

msg: restore peer addr checks

This was dropped in bf4938567943c80345966f9c5a3bdc75a913175b but should
not have been.  Since we are advertising the addr and not the bind
addr there is no reason to disable this check.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/msg/async/AsyncConnection.cc b/src/msg/async/AsyncConnection.cc
index 3c535f765337..fa3c76725ea9 100644
--- a/src/msg/async/AsyncConnection.cc
+++ b/src/msg/async/AsyncConnection.cc
@@ -978,8 +978,8 @@ ssize_t AsyncConnection::_process_connection()
                                 << " - presumably this is the same node!" << dendl;
           } else {
             ldout(async_msgr->cct, 10) << __func__ << " connect claims to be "
-                                << paddr << " not " << peer_addr
-                                << " (peer is possibly using public_bind_addr?) " << dendl;
+				       << paddr << " not " << peer_addr << dendl;
+	    goto fail;
           }
         }
 
diff --git a/src/msg/simple/Pipe.cc b/src/msg/simple/Pipe.cc
index 355c2528f938..4a7ab9acab7a 100644
--- a/src/msg/simple/Pipe.cc
+++ b/src/msg/simple/Pipe.cc
@@ -1090,8 +1090,8 @@ int Pipe::connect()
 	      << paddr << " not " << peer_addr << " - presumably this is the same node!" << dendl;
     } else {
       ldout(msgr->cct,10) << "connect claims to be "
-	      << paddr << " not " << peer_addr
-              << " (peer is possibly using public_bind_addr?) " << dendl;
+			  << paddr << " not " << peer_addr << dendl;
+      goto fail;
     }
   }