From cc8a4fcbe6afc0a549594cd31c9c54578c6ce278 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Tue, 9 Dec 2008 08:48:03 -0800
Subject: [PATCH] msgr: make sure nonce matches too when connecting to peer

Otherwise the predictable port numbers cause problems.
---
 src/msg/SimpleMessenger.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc
index 33bbac79cd5cf..157deaf660de6 100644
--- a/src/msg/SimpleMessenger.cc
+++ b/src/msg/SimpleMessenger.cc
@@ -1198,7 +1198,8 @@ int Rank::Pipe::connect()
   dout(20) << "connect read peer addr " << paddr << " on socket " << sd << dendl;
   if (!peer_addr.is_local_to(paddr)) {
     if (paddr.ipaddr.sin_addr.s_addr == 0 &&
-	peer_addr.ipaddr.sin_port == paddr.ipaddr.sin_port) {
+	peer_addr.ipaddr.sin_port == paddr.ipaddr.sin_port &&
+	peer_addr.nonce == paddr.nonce) {
       dout(0) << "connect claims to be " 
 	      << paddr << " not " << peer_addr << " - presumably this is the same node!" << dendl;
     } else {
-- 
2.39.5